diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
index 0e3365882280..5e72bab0be8c 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SDatabaseMetaData.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: kz $ $Date: 2006-11-06 15:00:46 $
+ *  last change: $Author: rt $ $Date: 2008-04-10 16:32:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  the BSD license.
@@ -38,21 +38,11 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SDATABASEMETADATA_HXX
 #include "SDatabaseMetaData.hxx"
-#endif
-#ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_
 #include <com/sun/star/sdbc/DataType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_RESULTSETTYPE_HPP_
 #include <com/sun/star/sdbc/ResultSetType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_RESULTSETCONCURRENCY_HPP_
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_TRANSACTIONISOLATION_HPP_
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
-#endif
 
 using namespace connectivity::skeleton;
 using namespace com::sun::star::uno;
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx
index 044f5425ce6a..159f49640680 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SPreparedStatement.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: kz $ $Date: 2006-11-06 15:01:12 $
+ *  last change: $Author: rt $ $Date: 2008-04-10 16:34:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  the BSD license.
@@ -39,24 +39,13 @@
  *************************************************************************/
 
 #include <stdio.h>
-
-#ifndef _OSL_DIAGNOSE_H_
 #include <osl/diagnose.h>
-#endif
 #include "SPreparedStatement.hxx"
-#ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_
 #include <com/sun/star/sdbc/DataType.hpp>
-#endif
 #include "SResultSetMetaData.hxx"
-#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
 #include <cppuhelper/typeprovider.hxx>
-#endif
-#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
 #include <com/sun/star/lang/DisposedException.hpp>
-#endif
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
 #include "propertyids.hxx"
-#endif
 
 using namespace connectivity::skeleton;
 using namespace com::sun::star::uno;
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
index bd0732830bae..56632ca1ac64 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SServices.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: kz $ $Date: 2006-11-06 15:01:54 $
+ *  last change: $Author: rt $ $Date: 2008-04-10 16:36:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  the BSD license.
@@ -39,12 +39,8 @@
  *************************************************************************/
 
 #include "SDriver.hxx"
-#ifndef _CPPUHELPER_FACTORY_HXX_
 #include <cppuhelper/factory.hxx>
-#endif
-#ifndef _OSL_DIAGNOSE_H_
 #include <osl/diagnose.h>
-#endif
 
 using namespace connectivity::skeleton;
 using ::rtl::OUString;
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx
index 3d47d4a0fdfa..4bd612c73414 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propertyids.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: kz $ $Date: 2006-11-06 15:02:21 $
+ *  last change: $Author: rt $ $Date: 2008-04-10 16:38:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  the BSD license.
@@ -38,9 +38,7 @@
  *
  *************************************************************************/
 
-#ifndef _OSL_DIAGNOSE_H_
 #include <osl/diagnose.h>
-#endif
 #include "propertyids.hxx"
 namespace connectivity
 {