diff --git a/src/osg/Uniform.cpp b/src/osg/Uniform.cpp
index a2452118c..5c5583f81 100644
--- a/src/osg/Uniform.cpp
+++ b/src/osg/Uniform.cpp
@@ -967,13 +967,12 @@ GLenum Uniform::getInternalArrayType( Type t )
     }
 }
 
+typedef std::map<std::string, unsigned int> UniformNameIDMap;
+static OpenThreads::Mutex s_mutex_uniformNameIDMap;
+static UniformNameIDMap s_uniformNameIDMap;
 
 unsigned int Uniform::getNameID(const std::string& name)
 {
-    typedef std::map<std::string, unsigned int> UniformNameIDMap;
-    static OpenThreads::Mutex s_mutex_uniformNameIDMap;
-    static UniformNameIDMap s_uniformNameIDMap;
-
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_mutex_uniformNameIDMap);
     UniformNameIDMap::iterator it = s_uniformNameIDMap.find(name);
     if (it != s_uniformNameIDMap.end())
diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp
index 15e144a55..32c73719e 100644
--- a/src/osgDB/Registry.cpp
+++ b/src/osgDB/Registry.cpp
@@ -749,11 +749,7 @@ std::string Registry::createLibraryNameForExtension(const std::string& ext)
     ExtensionAliasMap::iterator itr=_extAliasMap.find(lowercase_ext);
     if (itr!=_extAliasMap.end() && ext != itr->second) return createLibraryNameForExtension(itr->second);
 
-#if defined(OSG_JAVA_BUILD)
-    static std::string prepend = std::string("osgPlugins-")+std::string(osgGetVersion())+std::string("/java");
-#else
-    static std::string prepend = std::string("osgPlugins-")+std::string(osgGetVersion())+std::string("/");
-#endif
+    std::string prepend = std::string("osgPlugins-")+std::string(osgGetVersion())+std::string("/");
 
 #if defined(__CYGWIN__)
     return prepend+"cygwin_"+"osgdb_"+lowercase_ext+OSG_LIBRARY_POSTFIX_WITH_QUOTES+".dll";