diff --git a/src/OpenThreads/pthreads/CMakeLists.txt b/src/OpenThreads/pthreads/CMakeLists.txt
index a1e9decb8..1167e467a 100644
--- a/src/OpenThreads/pthreads/CMakeLists.txt
+++ b/src/OpenThreads/pthreads/CMakeLists.txt
@@ -8,9 +8,16 @@ INCLUDE (CheckCXXSourceCompiles)
 SET(LIB_NAME OpenThreads)
 SET(LIB_PUBLIC_HEADERS ${OpenThreads_PUBLIC_HEADERS})
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
+# FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
 	PThread.c++
 	PThreadBarrier.c++
 	PThreadBarrierPrivateData.h
diff --git a/src/osg/CMakeLists.txt b/src/osg/CMakeLists.txt
index 3a79a264c..2b7dd6add 100644
--- a/src/osg/CMakeLists.txt
+++ b/src/osg/CMakeLists.txt
@@ -170,9 +170,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/ref_ptr
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
+# FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     AlphaFunc.cpp
     AnimationPath.cpp
     ApplicationUsage.cpp
diff --git a/src/osgDB/CMakeLists.txt b/src/osgDB/CMakeLists.txt
index 3ab40eab2..efdef4ced 100644
--- a/src/osgDB/CMakeLists.txt
+++ b/src/osgDB/CMakeLists.txt
@@ -30,10 +30,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/WriteFile
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     Archive.cpp
     DatabasePager.cpp
     DotOsgWrapper.cpp
diff --git a/src/osgFX/CMakeLists.txt b/src/osgFX/CMakeLists.txt
index 96eed598d..b1531d32f 100644
--- a/src/osgFX/CMakeLists.txt
+++ b/src/osgFX/CMakeLists.txt
@@ -22,10 +22,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/Version
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     AnisotropicLighting.cpp
     BumpMapping.cpp
     Cartoon.cpp
diff --git a/src/osgGA/CMakeLists.txt b/src/osgGA/CMakeLists.txt
index ced211cd1..b951f177a 100644
--- a/src/osgGA/CMakeLists.txt
+++ b/src/osgGA/CMakeLists.txt
@@ -27,10 +27,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/Version
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     AnimationPathManipulator.cpp
     DriveManipulator.cpp
     EventQueue.cpp
diff --git a/src/osgIntrospection/CMakeLists.txt b/src/osgIntrospection/CMakeLists.txt
index 1da57ba4d..59c63e6e0 100644
--- a/src/osgIntrospection/CMakeLists.txt
+++ b/src/osgIntrospection/CMakeLists.txt
@@ -39,10 +39,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/variant_cast
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     ConstructorInfo.cpp
     CustomAttributeProvider.cpp
     DefaultReflectors.cpp
diff --git a/src/osgManipulator/CMakeLists.txt b/src/osgManipulator/CMakeLists.txt
index 9f8fba66c..1d688f07c 100644
--- a/src/osgManipulator/CMakeLists.txt
+++ b/src/osgManipulator/CMakeLists.txt
@@ -32,10 +32,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/Version
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     AntiSquish.cpp
     Command.cpp
     CommandManager.cpp
diff --git a/src/osgParticle/CMakeLists.txt b/src/osgParticle/CMakeLists.txt
index 88f8386e2..e074b5ae6 100644
--- a/src/osgParticle/CMakeLists.txt
+++ b/src/osgParticle/CMakeLists.txt
@@ -50,10 +50,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/Version
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     ConnectedParticleSystem.cpp
     Emitter.cpp
     ExplosionDebrisEffect.cpp
diff --git a/src/osgShadow/CMakeLists.txt b/src/osgShadow/CMakeLists.txt
index 8d5d18096..3a4cb180e 100644
--- a/src/osgShadow/CMakeLists.txt
+++ b/src/osgShadow/CMakeLists.txt
@@ -20,10 +20,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/Version
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     OccluderGeometry.cpp
     ShadowMap.cpp
     ShadowTechnique.cpp
diff --git a/src/osgSim/CMakeLists.txt b/src/osgSim/CMakeLists.txt
index d0ec49f9b..250a287d4 100644
--- a/src/osgSim/CMakeLists.txt
+++ b/src/osgSim/CMakeLists.txt
@@ -34,10 +34,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/VisibilityGroup
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     BlinkSequence.cpp
     ColorRange.cpp
     DOFTransform.cpp
diff --git a/src/osgTerrain/CMakeLists.txt b/src/osgTerrain/CMakeLists.txt
index 60ead26c7..64fe034d9 100644
--- a/src/osgTerrain/CMakeLists.txt
+++ b/src/osgTerrain/CMakeLists.txt
@@ -18,10 +18,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/Version
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     Layer.cpp
     Locator.cpp
     TerrainTile.cpp
diff --git a/src/osgText/CMakeLists.txt b/src/osgText/CMakeLists.txt
index 9a3026b40..7634377cb 100644
--- a/src/osgText/CMakeLists.txt
+++ b/src/osgText/CMakeLists.txt
@@ -20,10 +20,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/Version
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     DefaultFont.cpp
     DefaultFont.h
     Font.cpp
diff --git a/src/osgUtil/CMakeLists.txt b/src/osgUtil/CMakeLists.txt
index c79cbe5d2..60bd79538 100644
--- a/src/osgUtil/CMakeLists.txt
+++ b/src/osgUtil/CMakeLists.txt
@@ -48,9 +48,16 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/Version
 )
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
+ENDIF(APPLE)
+
+# FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     CubeMapGenerator.cpp
     CullVisitor.cpp
     DelaunayTriangulator.cpp
diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt
index 1228cbcc8..5f4669af8 100644
--- a/src/osgViewer/CMakeLists.txt
+++ b/src/osgViewer/CMakeLists.txt
@@ -87,11 +87,16 @@ ELSE(WIN32)
 
 ENDIF(WIN32)
 
+IF(APPLE)
+    SET(ADD_LIBRARY_HEADERS "")
+ELSEIF(APPLE)
+    SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ${LIB_PRIVATE_HEADERS})
+ENDIF(APPLE)
 
+# FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
     ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
-    ${LIB_PRIVATE_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
     ${LIB_COMMON_FILES}
 )