11 files changed, 31 insertions, 31 deletions
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index df89dcbbb1ef..36253419e4d1 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef MYSQLC_CONNECTION_HXX
-#define MYSQLC_CONNECTION_HXX
+#ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_CONNECTION_HXX
+#define INCLUDED_MYSQLC_SOURCE_MYSQLC_CONNECTION_HXX
 
 #include "mysqlc_subcomponent.hxx"
 #include "mysqlc_types.hxx"
@@ -237,7 +237,7 @@ namespace connectivity
         //inline OUString getPattern(OUString p) { return (p.getLength()) ? p : ASC2OU("%"); }
     } /* mysqlc */
 } /* connectivity */
-#endif // MYSQLC_CONNECTION_HXX
+#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_CONNECTION_HXX
 
 /*
  * Local variables:
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
index 025cbbafeadc..d80988483ac5 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_SDATABASEMETADATA_HXX
-#define CONNECTIVITY_SDATABASEMETADATA_HXX
+#ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_DATABASEMETADATA_HXX
+#define INCLUDED_MYSQLC_SOURCE_MYSQLC_DATABASEMETADATA_HXX
 
 #include "mysqlc_connection.hxx"
 
@@ -225,6 +225,6 @@ namespace connectivity
     }
 }
 
-#endif // CONNECTIVITY_SDATABASEMETADATA_HXX
+#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_DATABASEMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
index e73e7aeab7d8..76cc4e5d46fb 100644
--- a/mysqlc/source/mysqlc_driver.hxx
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -24,8 +24,8 @@
 * for a copy of the LGPLv3 License.
 ************************************************************************/
 
-#ifndef MYSQLC_SDRIVER_HXX
-#define MYSQLC_SDRIVER_HXX
+#ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_DRIVER_HXX
+#define INCLUDED_MYSQLC_SOURCE_MYSQLC_DRIVER_HXX
 
 #include <config_lgpl.h>
 
@@ -109,7 +109,7 @@ namespace connectivity
     } /* mysqlc */
 } /* connectivity */
 
-#endif // MYSQLC_SDRIVER_HXX
+#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_DRIVER_HXX
 /*
  * Local variables:
  * tab-width: 4
diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
index c4540abb5449..acf17be78c01 100644
--- a/mysqlc/source/mysqlc_general.hxx
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MYSQLC_GENERAL_
-#define _MYSQLC_GENERAL_
+#ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_GENERAL_HXX
+#define INCLUDED_MYSQLC_SOURCE_MYSQLC_GENERAL_HXX
 
 #include <config_lgpl.h>
 
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx
index 54ac8cd43983..0e50dcd2168e 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_SPREPAREDSTATEMENT_HXX
-#define CONNECTIVITY_SPREPAREDSTATEMENT_HXX
+#ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_PREPAREDSTATEMENT_HXX
+#define INCLUDED_MYSQLC_SOURCE_MYSQLC_PREPAREDSTATEMENT_HXX
 #include "mysqlc_statement.hxx"
 #include "mysqlc_resultset.hxx"
 
@@ -170,7 +170,7 @@ namespace connectivity
         };
     } /* mysqlc */
 } /* connectivity */
-#endif // CONNECTIVITY_SPREPAREDSTATEMENT_HXX
+#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_PREPAREDSTATEMENT_HXX
 
 /*
  * Local variables:
diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx
index 98ffd07211ca..4e7ac46038ad 100644
--- a/mysqlc/source/mysqlc_propertyids.hxx
+++ b/mysqlc/source/mysqlc_propertyids.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#define _CONNECTIVITY_PROPERTYIDS_HXX_
+#ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_PROPERTYIDS_HXX
+#define INCLUDED_MYSQLC_SOURCE_MYSQLC_PROPERTYIDS_HXX
 
 // this define has to be set to split the names into different dll's or so's
 // every dll has his own set of property names
@@ -145,7 +145,7 @@ pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERT
 
 
 
-#endif // _CONNECTIVITY_PROPERTYIDS_HXX_
+#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_PROPERTYIDS_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx
index 51db8dcf2ad7..6c742c5e6790 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef MYSQLC_SRESULTSET_HXX
-#define MYSQLC_SRESULTSET_HXX
+#ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_RESULTSET_HXX
+#define INCLUDED_MYSQLC_SOURCE_MYSQLC_RESULTSET_HXX
 
 #include "mysqlc_preparedstatement.hxx"
 #include "mysqlc_statement.hxx"
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index 55680ab1d31f..8f83b427949d 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_SRESULSETMETADATA_HXX
-#define CONNECTIVITY_SRESULSETMETADATA_HXX
+#ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_RESULTSETMETADATA_HXX
+#define INCLUDED_MYSQLC_SOURCE_MYSQLC_RESULTSETMETADATA_HXX
 
 #include "mysqlc_connection.hxx"
 
@@ -98,6 +98,6 @@ namespace connectivity
     }
 }
 
-#endif // CONNECTIVITY_SRESULSETMETADATA_HXX
+#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_RESULTSETMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx
index 41034316f64e..aa94e9f39f5e 100644
--- a/mysqlc/source/mysqlc_statement.hxx
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef MYSQLC_STATEMENT_HXX
-#define MYSQLC_STATEMENT_HXX
+#ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_STATEMENT_HXX
+#define INCLUDED_MYSQLC_SOURCE_MYSQLC_STATEMENT_HXX
 
 #include "mysqlc_connection.hxx"
 #include "mysqlc_subcomponent.hxx"
@@ -203,7 +203,7 @@ namespace connectivity
         };
     }
 }
-#endif // MYSQLC_STATEMENT_HXX
+#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_STATEMENT_HXX
 
 /*
  * Local variables:
diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx
index 2c7bfa578c10..fc9a08732556 100644
--- a/mysqlc/source/mysqlc_subcomponent.hxx
+++ b/mysqlc/source/mysqlc_subcomponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_OSUBCOMPONENT_HXX_
-#define _CONNECTIVITY_OSUBCOMPONENT_HXX_
+#ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_SUBCOMPONENT_HXX
+#define INCLUDED_MYSQLC_SOURCE_MYSQLC_SUBCOMPONENT_HXX
 
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <cppuhelper/interfacecontainer.h>
@@ -196,6 +196,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_
+#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_SUBCOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/mysqlc/source/mysqlc_types.hxx b/mysqlc/source/mysqlc_types.hxx
index 9c86e84cebdf..50b2014c9502 100644
--- a/mysqlc/source/mysqlc_types.hxx
+++ b/mysqlc/source/mysqlc_types.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef MYSQLC_TYPES_HXX
-#define MYSQLC_TYPES_HXX
+#ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_TYPES_HXX
+#define INCLUDED_MYSQLC_SOURCE_MYSQLC_TYPES_HXX
 
 struct TypeInfoDef {
     const char *typeName;
@@ -43,6 +43,6 @@ struct TypeInfoDef {
 
 extern TypeInfoDef mysqlc_types[];
 
-#endif /* MYSQLC_TYPES_HXX */
+#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */