diff --git a/simgear/scene/material/Effect.hxx b/simgear/scene/material/Effect.hxx
index 496805a2..ba255d0a 100644
--- a/simgear/scene/material/Effect.hxx
+++ b/simgear/scene/material/Effect.hxx
@@ -53,9 +53,6 @@ class Technique;
 class Effect;
 class SGReaderWriterOptions;
 
-using namespace osg;
-using namespace std;
-
 /**
  * Object to be initialized at some point after an effect -- and its
  * containing effect geode -- are hooked into the scene graph. Some
@@ -179,9 +176,9 @@ void mergePropertyTrees(SGPropertyNode* resultNode,
 
 class UniformFactoryImpl {
 public:
-    ref_ptr<Uniform> getUniform( Effect * effect,
+    osg::ref_ptr<osg::Uniform> getUniform( Effect * effect,
                                  const string & name,
-                                 Uniform::Type uniformType,
+                                 osg::Uniform::Type uniformType,
                                  SGConstPropertyNode_ptr valProp,
                                  const SGReaderWriterOptions* options );
     void updateListeners( SGPropertyNode* propRoot );
@@ -194,9 +191,9 @@ private:
 
     SGMutex _mutex;
 
-    typedef boost::tuple<std::string, Uniform::Type, std::string, std::string> UniformCacheKey;
-    typedef boost::tuple<ref_ptr<Uniform>, SGPropertyChangeListener*> UniformCacheValue;
-    std::map<UniformCacheKey,ref_ptr<Uniform> > uniformCache;
+    typedef boost::tuple<std::string, osg::Uniform::Type, std::string, std::string> UniformCacheKey;
+    typedef boost::tuple<osg::ref_ptr<osg::Uniform>, SGPropertyChangeListener*> UniformCacheValue;
+    std::map<UniformCacheKey,osg::ref_ptr<osg::Uniform> > uniformCache;
 
     typedef std::queue<DeferredPropertyListener*> DeferredListenerList;
     DeferredListenerList deferredListenerList;
diff --git a/simgear/scene/viewer/CompositorPass.cxx b/simgear/scene/viewer/CompositorPass.cxx
index 2187a494..0b0b6ac3 100644
--- a/simgear/scene/viewer/CompositorPass.cxx
+++ b/simgear/scene/viewer/CompositorPass.cxx
@@ -89,7 +89,7 @@ PassBuilder::build(Compositor *compositor, const SGPropertyNode *root,
     pass->type = root->getStringValue("type");
     pass->effect_scheme = root->getStringValue("effect-scheme");
 
-    osg::Camera *camera = new Camera;
+    osg::Camera *camera = new osg::Camera;
     pass->camera = camera;
 
     camera->setName(pass->name);
@@ -107,8 +107,8 @@ PassBuilder::build(Compositor *compositor, const SGPropertyNode *root,
     camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
 
     // XXX: Should we make this configurable?
-    camera->setCullingMode(CullSettings::SMALL_FEATURE_CULLING
-                           | CullSettings::VIEW_FRUSTUM_CULLING);
+    camera->setCullingMode(osg::CullSettings::SMALL_FEATURE_CULLING
+                           | osg::CullSettings::VIEW_FRUSTUM_CULLING);
 
     osg::Node::NodeMask cull_mask =
         std::stoul(root->getStringValue("cull-mask", "0xffffffff"), nullptr, 0);
@@ -639,8 +639,8 @@ public:
 protected:
     // Given a projection matrix, return a new one with the same frustum
     // sides and new near / far values.
-    void makeNewProjMat(Matrixd& oldProj, double znear,
-                        double zfar, Matrixd& projection) {
+    void makeNewProjMat(osg::Matrixd& oldProj, double znear,
+                        double zfar, osg::Matrixd& projection) {
         projection = oldProj;
         // Slightly inflate the near & far planes to avoid objects at the
         // extremes being clipped out.