diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fdce8907..b9b07f7a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -547,14 +547,9 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
     # errors instead of warnings for certain issues, including superfluous
     # semicolons and commas, and the use of long long. -fpermissive seems
     # to be the workaround.
-    SET(OSG_AGGRESSIVE_WARNING_FLAGS -Wall -Wparentheses -Wformat=2 -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive)
+    SET(OSG_AGGRESSIVE_WARNING_FLAGS -Wall -Wparentheses -Wuninitialized -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive)
 
-    IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-
-        # disable the "warning: format not a string literal and no format arguments" emited from std library ostream support
-        SET(OSG_AGGRESSIVE_WARNING_FLAGS ${OSG_AGGRESSIVE_WARNING_FLAGS} -Wformat=0)
-
-    ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+    # Previous included -Wformat=2 in OSG_AGGRESSIVE_WARNING_FLAGS but had to remove it due to standard library errors
 
 
 ELSE(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/include/osg/Export b/include/osg/Export
index 49f6cfbb5..1b444abc1 100644
--- a/include/osg/Export
+++ b/include/osg/Export
@@ -25,6 +25,7 @@
     #pragma warning( disable : 4244 )
     #pragma warning( disable : 4251 )
     #pragma warning( disable : 4275 )
+    #pragma warning( disable : 4512 )
 #endif
 
 #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__)  || defined( __MWERKS__)