diff --git a/examples/osgcatch/osgcatch.cpp b/examples/osgcatch/osgcatch.cpp
index ecd6b1163..c34b61222 100644
--- a/examples/osgcatch/osgcatch.cpp
+++ b/examples/osgcatch/osgcatch.cpp
@@ -1425,9 +1425,9 @@ int main( int argc, char **argv )
     // now the windows have been realized we switch off the cursor to prevent it
     // distracting the people seeing the stereo images.
     float fovy = 1.0f;
-    for( unsigned int i = 0; i < viewer.getCameraConfig()->getNumberOfCameras(); i++ )
+    for( unsigned int i = 0; i < viewer.getNumberOfCameras(); i++ )
     {
-        Producer::Camera* cam = viewer.getCameraConfig()->getCamera(i);
+        Producer::Camera* cam = viewer.getCamera(i);
         Producer::RenderSurface* rs = cam->getRenderSurface();
         rs->useCursor(false);
         fovy = osg::DegreesToRadians(cam->getLensVerticalFov());
diff --git a/examples/osgcluster/osgcluster.cpp b/examples/osgcluster/osgcluster.cpp
index 3e47a9b98..1553c3f5c 100644
--- a/examples/osgcluster/osgcluster.cpp
+++ b/examples/osgcluster/osgcluster.cpp
@@ -510,7 +510,7 @@ int main( int argc, char **argv )
             {
                 
                 // take camera zero as the guide.
-                osg::Matrix modelview(viewer.getCameraConfig()->getCamera(0)->getViewMatrix());
+                osg::Matrix modelview(viewer.getCamera(0)->getViewMatrix());
                 
                 cp->setPacket(modelview,viewer.getFrameStamp());
                 
diff --git a/examples/osgpbuffer/osgpbuffer.cpp b/examples/osgpbuffer/osgpbuffer.cpp
index 9b53d73ad..55fd2963f 100644
--- a/examples/osgpbuffer/osgpbuffer.cpp
+++ b/examples/osgpbuffer/osgpbuffer.cpp
@@ -19,6 +19,7 @@
 
 #include <osgUtil/SmoothingVisitor>
 
+#include <Producer/CameraConfig>
 
 class PBufferTexture2D : public osg::Texture2D
 {
diff --git a/examples/osgphotoalbum/osgphotoalbum.cpp b/examples/osgphotoalbum/osgphotoalbum.cpp
index b526805d1..38349ec2b 100644
--- a/examples/osgphotoalbum/osgphotoalbum.cpp
+++ b/examples/osgphotoalbum/osgphotoalbum.cpp
@@ -744,9 +744,9 @@ int main( int argc, char **argv )
     // distracting the people seeing the stereo images.
     float fovx = 1.25f;
     float fovy = 1.0f;
-    for( unsigned int i = 0; i < viewer.getCameraConfig()->getNumberOfCameras(); i++ )
+    for( unsigned int i = 0; i < viewer.getNumberOfCameras(); i++ )
     {
-        Producer::Camera* cam = viewer.getCameraConfig()->getCamera(i);
+        Producer::Camera* cam = viewer.getCamera(i);
         //Producer::RenderSurface* rs = cam->getRenderSurface();
         //rs->useCursor(false);
         fovx = cam->getLensHorizontalFov();
diff --git a/examples/osgstereoimage/osgstereoimage.cpp b/examples/osgstereoimage/osgstereoimage.cpp
index 89e1afea7..c7b0449ae 100644
--- a/examples/osgstereoimage/osgstereoimage.cpp
+++ b/examples/osgstereoimage/osgstereoimage.cpp
@@ -475,9 +475,9 @@ int main( int argc, char **argv )
     // now the windows have been realized we switch off the cursor to prevent it
     // distracting the people seeing the stereo images.
     float fovy = 1.0f;
-    for( unsigned int i = 0; i < viewer.getCameraConfig()->getNumberOfCameras(); i++ )
+    for( unsigned int i = 0; i < viewer.getNumberOfCameras(); i++ )
     {
-        Producer::Camera* cam = viewer.getCameraConfig()->getCamera(i);
+        Producer::Camera* cam = viewer.getCamera(i);
         Producer::RenderSurface* rs = cam->getRenderSurface();
         rs->useCursor(false);
         fovy = osg::DegreesToRadians(cam->getLensVerticalFov());
diff --git a/examples/osgwindows/osgwindows.cpp b/examples/osgwindows/osgwindows.cpp
index e3c418dd3..a9fd3a7ec 100644
--- a/examples/osgwindows/osgwindows.cpp
+++ b/examples/osgwindows/osgwindows.cpp
@@ -13,6 +13,8 @@
 #include <osgUtil/Optimizer>
 #include <osgProducer/Viewer>
 
+#include <Producer/CameraConfig>
+
 static Producer::CameraConfig *BuildConfig(void)
 {
 #define TWO_SEPERATE_WINDOWS