fixincludeguards.sh: include/o*

Change-Id: Ibd5d8af00f6582d53231c76e2b04e737b5804497
author: Thomas Arnhold <thomas@arnhold.org> 2013-10-23 19:17:28 +0200
committer: Thomas Arnhold <thomas@arnhold.org> 2013-10-23 23:22:30 +0200
commit: 10d0526d7273df6b52a2f46b68fb0e63f9db0d92 (patch)
tree: 2edf62b3c0f11dfce96f30433fa918c46e022f54 /include
parent: fixincludeguards.sh: include/c* (diff)
download: core-10d0526d7273df6b52a2f46b68fb0e63f9db0d92.tar.gz
core-10d0526d7273df6b52a2f46b68fb0e63f9db0d92.zip
199 files changed, 464 insertions, 464 deletions
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index 64b06d4244ef..c4fbd82fa152 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_BINARYCODEC_HXX
-#define OOX_CORE_BINARYCODEC_HXX
+#ifndef INCLUDED_OOX_CORE_BINARYCODEC_HXX
+#define INCLUDED_OOX_CORE_BINARYCODEC_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index f11dc1d6260a..0baf9e4b136e 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_CONTEXTHANDLER_HXX
-#define OOX_CORE_CONTEXTHANDLER_HXX
+#ifndef INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX
+#define INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX
 
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index 82e27b89b6dd..b537c59ee499 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_CONTEXTHANDLER2_HXX
-#define OOX_CORE_CONTEXTHANDLER2_HXX
+#ifndef INCLUDED_OOX_CORE_CONTEXTHANDLER2_HXX
+#define INCLUDED_OOX_CORE_CONTEXTHANDLER2_HXX
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index 40b5e763998f..b454caffd4b8 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FASTPARSER_HXX
-#define OOX_CORE_FASTPARSER_HXX
+#ifndef INCLUDED_OOX_CORE_FASTPARSER_HXX
+#define INCLUDED_OOX_CORE_FASTPARSER_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx
index 05c7063d3925..b79472c7e466 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FASTTOKENHANDLER_HXX
-#define OOX_CORE_FASTTOKENHANDLER_HXX
+#ifndef INCLUDED_OOX_CORE_FASTTOKENHANDLER_HXX
+#define INCLUDED_OOX_CORE_FASTTOKENHANDLER_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index da8600659071..5b2624c96603 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FILTERBASE_HXX
-#define OOX_CORE_FILTERBASE_HXX
+#ifndef INCLUDED_OOX_CORE_FILTERBASE_HXX
+#define INCLUDED_OOX_CORE_FILTERBASE_HXX
 
 #include <memory>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index cd9573b0f0bd..7a63aedd1127 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FILTERDETECT_HXX
-#define OOX_CORE_FILTERDETECT_HXX
+#ifndef INCLUDED_OOX_CORE_FILTERDETECT_HXX
+#define INCLUDED_OOX_CORE_FILTERDETECT_HXX
 
 #include <vector>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx
index 5c3ad7600cf2..da531dad994e 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FRAGMENTHANDLER_HXX
-#define OOX_CORE_FRAGMENTHANDLER_HXX
+#ifndef INCLUDED_OOX_CORE_FRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_CORE_FRAGMENTHANDLER_HXX
 
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
 #include <cppuhelper/implbase1.hxx>
diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx
index 6f0822da6ec4..bdd73f0c185f 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FRAGMENTHANDLER2_HXX
-#define OOX_CORE_FRAGMENTHANDLER2_HXX
+#ifndef INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX
+#define INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/core/fragmenthandler.hxx"
diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx
index f1a6817be68f..79bcbd86f477 100644
--- a/include/oox/core/recordparser.hxx
+++ b/include/oox/core/recordparser.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_RECORDPARSER_HXX
-#define OOX_CORE_RECORDPARSER_HXX
+#ifndef INCLUDED_OOX_CORE_RECORDPARSER_HXX
+#define INCLUDED_OOX_CORE_RECORDPARSER_HXX
 
 #include <map>
 #include <com/sun/star/io/IOException.hpp>
diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx
index c3f10aea55df..b1c2ea8499f6 100644
--- a/include/oox/core/relations.hxx
+++ b/include/oox/core/relations.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_RELATIONS_HXX
-#define OOX_CORE_RELATIONS_HXX
+#ifndef INCLUDED_OOX_CORE_RELATIONS_HXX
+#define INCLUDED_OOX_CORE_RELATIONS_HXX
 
 #include <map>
 #include <boost/shared_ptr.hpp>
diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx
index d42e5d1ad8b7..4d3a8ff41802 100644
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_RELATIONSHANDLER_HXX
-#define OOX_CORE_RELATIONSHANDLER_HXX
+#ifndef INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX
+#define INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX
 
 #include "oox/core/fragmenthandler.hxx"
 
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 7414e71c2228..54a4d75e4306 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_XMLFILTERBASE_HXX
-#define OOX_CORE_XMLFILTERBASE_HXX
+#ifndef INCLUDED_OOX_CORE_XMLFILTERBASE_HXX
+#define INCLUDED_OOX_CORE_XMLFILTERBASE_HXX
 
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx
index 9a384885d19d..e6cf73bc924f 100644
--- a/include/oox/crypto/AgileEngine.hxx
+++ b/include/oox/crypto/AgileEngine.hxx
@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef AGILE_ENGINE_HXX
-#define AGILE_ENGINE_HXX
+#ifndef INCLUDED_OOX_CRYPTO_AGILEENGINE_HXX
+#define INCLUDED_OOX_CRYPTO_AGILEENGINE_HXX
 
 #include "CryptTools.hxx"
 #include "CryptoEngine.hxx"
diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx
index 07abc71bf16e..5b87296b310e 100644
--- a/include/oox/crypto/CryptTools.hxx
+++ b/include/oox/crypto/CryptTools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CRYPT_TOOLS_HXX
-#define CRYPT_TOOLS_HXX
+#ifndef INCLUDED_OOX_CRYPTO_CRYPTTOOLS_HXX
+#define INCLUDED_OOX_CRYPTO_CRYPTTOOLS_HXX
 
 #include <config_oox.h>
 
diff --git a/include/oox/crypto/CryptoEngine.hxx b/include/oox/crypto/CryptoEngine.hxx
index 68bb0a8fa3f1..c653ec6ff724 100644
--- a/include/oox/crypto/CryptoEngine.hxx
+++ b/include/oox/crypto/CryptoEngine.hxx
@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef CRYPTO_ENGINE_HXX
-#define CRYPTO_ENGINE_HXX
+#ifndef INCLUDED_OOX_CRYPTO_CRYPTOENGINE_HXX
+#define INCLUDED_OOX_CRYPTO_CRYPTOENGINE_HXX
 
 #include <vector>
 
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index 1502c41f3d6e..561aaaf32817 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef DOCUMENT_DECRYPTION_HXX
-#define DOCUMENT_DECRYPTION_HXX
+#ifndef INCLUDED_OOX_CRYPTO_DOCUMENTDECRYPTION_HXX
+#define INCLUDED_OOX_CRYPTO_DOCUMENTDECRYPTION_HXX
 
 #include "oox/dllapi.h"
 
diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx
index b4e142ea2ade..960eda15beb1 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef DOCUMENT_ENCRYPTION_HXX
-#define DOCUMENT_ENCRYPTION_HXX
+#ifndef INCLUDED_OOX_CRYPTO_DOCUMENTENCRYPTION_HXX
+#define INCLUDED_OOX_CRYPTO_DOCUMENTENCRYPTION_HXX
 
 #include "oox/dllapi.h"
 
diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx
index 563a7105b5fa..a248deaed716 100644
--- a/include/oox/crypto/Standard2007Engine.hxx
+++ b/include/oox/crypto/Standard2007Engine.hxx
@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef STANDARD_2007_ENGINE_HXX
-#define STANDARD_2007_ENGINE_HXX
+#ifndef INCLUDED_OOX_CRYPTO_STANDARD2007ENGINE_HXX
+#define INCLUDED_OOX_CRYPTO_STANDARD2007ENGINE_HXX
 
 #include "CryptTools.hxx"
 #include "CryptoEngine.hxx"
diff --git a/include/oox/drawingml/chart/axiscontext.hxx b/include/oox/drawingml/chart/axiscontext.hxx
index d22a53f23227..2c00475f614f 100644
--- a/include/oox/drawingml/chart/axiscontext.hxx
+++ b/include/oox/drawingml/chart/axiscontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
-#define OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 
diff --git a/include/oox/drawingml/chart/axisconverter.hxx b/include/oox/drawingml/chart/axisconverter.hxx
index fac1d67c8997..cf21cc7a9cf0 100644
--- a/include/oox/drawingml/chart/axisconverter.hxx
+++ b/include/oox/drawingml/chart/axisconverter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
-#define OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 
diff --git a/include/oox/drawingml/chart/axismodel.hxx b/include/oox/drawingml/chart/axismodel.hxx
index 30ceae499b0a..403a96656a0a 100644
--- a/include/oox/drawingml/chart/axismodel.hxx
+++ b/include/oox/drawingml/chart/axismodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_AXISMODEL_HXX
-#define OOX_DRAWINGML_CHART_AXISMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_AXISMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_AXISMODEL_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/chart/titlemodel.hxx"
diff --git a/include/oox/drawingml/chart/chartcontextbase.hxx b/include/oox/drawingml/chart/chartcontextbase.hxx
index a244ad7dba6b..2e5874e42f87 100644
--- a/include/oox/drawingml/chart/chartcontextbase.hxx
+++ b/include/oox/drawingml/chart/chartcontextbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTCONTEXTBASE_HXX
-#define OOX_DRAWINGML_CHART_CHARTCONTEXTBASE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTCONTEXTBASE_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTCONTEXTBASE_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 
diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx
index bbc7e0fafd28..eefc11c8b3a8 100644
--- a/include/oox/drawingml/chart/chartconverter.hxx
+++ b/include/oox/drawingml/chart/chartconverter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTCONVERTER_HXX
-#define OOX_DRAWINGML_CHART_CHARTCONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTCONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTCONVERTER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>
diff --git a/include/oox/drawingml/chart/chartdrawingfragment.hxx b/include/oox/drawingml/chart/chartdrawingfragment.hxx
index 48ca9f234eec..e423a4c313c5 100644
--- a/include/oox/drawingml/chart/chartdrawingfragment.hxx
+++ b/include/oox/drawingml/chart/chartdrawingfragment.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTDRAWINGFRAGMENT_HXX
-#define OOX_DRAWINGML_CHART_CHARTDRAWINGFRAGMENT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTDRAWINGFRAGMENT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTDRAWINGFRAGMENT_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/drawingml/shape.hxx"
diff --git a/include/oox/drawingml/chart/chartspaceconverter.hxx b/include/oox/drawingml/chart/chartspaceconverter.hxx
index 2bdeb013b1b3..2d6244cd9233 100644
--- a/include/oox/drawingml/chart/chartspaceconverter.hxx
+++ b/include/oox/drawingml/chart/chartspaceconverter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
-#define OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 
diff --git a/include/oox/drawingml/chart/chartspacefragment.hxx b/include/oox/drawingml/chart/chartspacefragment.hxx
index c9b1e0c6b776..1a63a82b02ae 100644
--- a/include/oox/drawingml/chart/chartspacefragment.hxx
+++ b/include/oox/drawingml/chart/chartspacefragment.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
-#define OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 
diff --git a/include/oox/drawingml/chart/chartspacemodel.hxx b/include/oox/drawingml/chart/chartspacemodel.hxx
index b3d3405c4670..f79a0fe8411d 100644
--- a/include/oox/drawingml/chart/chartspacemodel.hxx
+++ b/include/oox/drawingml/chart/chartspacemodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTSPACEMODEL_HXX
-#define OOX_DRAWINGML_CHART_CHARTSPACEMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEMODEL_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/chart/plotareamodel.hxx"
diff --git a/include/oox/drawingml/chart/converterbase.hxx b/include/oox/drawingml/chart/converterbase.hxx
index 5641389ad98c..7b6f718b5971 100644
--- a/include/oox/drawingml/chart/converterbase.hxx
+++ b/include/oox/drawingml/chart/converterbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
-#define OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 #include "oox/drawingml/chart/objectformatter.hxx"
diff --git a/include/oox/drawingml/chart/datasourcecontext.hxx b/include/oox/drawingml/chart/datasourcecontext.hxx
index 163b99c868e4..1d5f404aeb4a 100644
--- a/include/oox/drawingml/chart/datasourcecontext.hxx
+++ b/include/oox/drawingml/chart/datasourcecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
-#define OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 
diff --git a/include/oox/drawingml/chart/datasourceconverter.hxx b/include/oox/drawingml/chart/datasourceconverter.hxx
index e8b5649e1bef..a45009b18367 100644
--- a/include/oox/drawingml/chart/datasourceconverter.hxx
+++ b/include/oox/drawingml/chart/datasourceconverter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
-#define OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 
diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx
index d43048ef071c..4e4579c0b298 100644
--- a/include/oox/drawingml/chart/datasourcemodel.hxx
+++ b/include/oox/drawingml/chart/datasourcemodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_DATASOURCEMODEL_HXX
-#define OOX_DRAWINGML_CHART_DATASOURCEMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_DATASOURCEMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCEMODEL_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 #include "oox/drawingml/chart/modelbase.hxx"
diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx
index 89e8837e8f9e..61bc90432a68 100644
--- a/include/oox/drawingml/chart/modelbase.hxx
+++ b/include/oox/drawingml/chart/modelbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_MODELBASE_HXX
-#define OOX_DRAWINGML_CHART_MODELBASE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_MODELBASE_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_MODELBASE_HXX
 
 #include "oox/helper/helper.hxx"
 #include "oox/helper/refmap.hxx"
diff --git a/include/oox/drawingml/chart/objectformatter.hxx b/include/oox/drawingml/chart/objectformatter.hxx
index 5b2bb727f4fd..bde717406158 100644
--- a/include/oox/drawingml/chart/objectformatter.hxx
+++ b/include/oox/drawingml/chart/objectformatter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
-#define OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
 
 #include "oox/helper/propertyset.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
diff --git a/include/oox/drawingml/chart/plotareacontext.hxx b/include/oox/drawingml/chart/plotareacontext.hxx
index d9966a8d8bf4..7bff6a4cbf2c 100644
--- a/include/oox/drawingml/chart/plotareacontext.hxx
+++ b/include/oox/drawingml/chart/plotareacontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
-#define OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 
diff --git a/include/oox/drawingml/chart/plotareaconverter.hxx b/include/oox/drawingml/chart/plotareaconverter.hxx
index 7dd58ab807a7..e041733bd5a4 100644
--- a/include/oox/drawingml/chart/plotareaconverter.hxx
+++ b/include/oox/drawingml/chart/plotareaconverter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
-#define OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 
diff --git a/include/oox/drawingml/chart/plotareamodel.hxx b/include/oox/drawingml/chart/plotareamodel.hxx
index 2afd6ccdd1da..140d6baf0328 100644
--- a/include/oox/drawingml/chart/plotareamodel.hxx
+++ b/include/oox/drawingml/chart/plotareamodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_PLOTAREAMODEL_HXX
-#define OOX_DRAWINGML_CHART_PLOTAREAMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_PLOTAREAMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREAMODEL_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/chart/axismodel.hxx"
diff --git a/include/oox/drawingml/chart/seriescontext.hxx b/include/oox/drawingml/chart/seriescontext.hxx
index e31156dd2796..0df07d3ecadc 100644
--- a/include/oox/drawingml/chart/seriescontext.hxx
+++ b/include/oox/drawingml/chart/seriescontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
-#define OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 
diff --git a/include/oox/drawingml/chart/seriesconverter.hxx b/include/oox/drawingml/chart/seriesconverter.hxx
index 073073c5bbe7..c914ed0a6ac5 100644
--- a/include/oox/drawingml/chart/seriesconverter.hxx
+++ b/include/oox/drawingml/chart/seriesconverter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
-#define OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 #include "oox/drawingml/chart/seriesmodel.hxx"
diff --git a/include/oox/drawingml/chart/seriesmodel.hxx b/include/oox/drawingml/chart/seriesmodel.hxx
index 998065f7f8ad..26b6ad391bf9 100644
--- a/include/oox/drawingml/chart/seriesmodel.hxx
+++ b/include/oox/drawingml/chart/seriesmodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_SERIESMODEL_HXX
-#define OOX_DRAWINGML_CHART_SERIESMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_SERIESMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_SERIESMODEL_HXX
 
 #include "oox/drawingml/chart/datasourcemodel.hxx"
 #include "oox/drawingml/chart/titlemodel.hxx"
diff --git a/include/oox/drawingml/chart/titlecontext.hxx b/include/oox/drawingml/chart/titlecontext.hxx
index b00a9ed45b6d..0e38fe46c367 100644
--- a/include/oox/drawingml/chart/titlecontext.hxx
+++ b/include/oox/drawingml/chart/titlecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
-#define OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 
diff --git a/include/oox/drawingml/chart/titleconverter.hxx b/include/oox/drawingml/chart/titleconverter.hxx
index ad3694568efe..ad6a607037c3 100644
--- a/include/oox/drawingml/chart/titleconverter.hxx
+++ b/include/oox/drawingml/chart/titleconverter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
-#define OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 
diff --git a/include/oox/drawingml/chart/titlemodel.hxx b/include/oox/drawingml/chart/titlemodel.hxx
index f365d0b6ec89..571c3cec1f32 100644
--- a/include/oox/drawingml/chart/titlemodel.hxx
+++ b/include/oox/drawingml/chart/titlemodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TITLEMODEL_HXX
-#define OOX_DRAWINGML_CHART_TITLEMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TITLEMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TITLEMODEL_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/chart/datasourcemodel.hxx"
diff --git a/include/oox/drawingml/chart/typegroupcontext.hxx b/include/oox/drawingml/chart/typegroupcontext.hxx
index 52667817ff0d..4269808bc6e1 100644
--- a/include/oox/drawingml/chart/typegroupcontext.hxx
+++ b/include/oox/drawingml/chart/typegroupcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
-#define OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 
diff --git a/include/oox/drawingml/chart/typegroupconverter.hxx b/include/oox/drawingml/chart/typegroupconverter.hxx
index 16afc572279c..0cc87129c66e 100644
--- a/include/oox/drawingml/chart/typegroupconverter.hxx
+++ b/include/oox/drawingml/chart/typegroupconverter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
-#define OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 
diff --git a/include/oox/drawingml/chart/typegroupmodel.hxx b/include/oox/drawingml/chart/typegroupmodel.hxx
index 1949a3ee892e..9741d1c1553e 100644
--- a/include/oox/drawingml/chart/typegroupmodel.hxx
+++ b/include/oox/drawingml/chart/typegroupmodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
-#define OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
 
 #include "oox/drawingml/chart/seriesmodel.hxx"
 
diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx
index 7c4f0106cb43..41495b65c76a 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CLRSCHEME_HXX
-#define OOX_DRAWINGML_CLRSCHEME_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
+#define INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <map>
@@ -57,6 +57,6 @@ typedef boost::shared_ptr< ClrScheme > ClrSchemePtr;
 
 } }
 
-#endif  //  OOX_DRAWINGML_CLRSCHEME_HXX
+#endif // INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/clrschemecontext.hxx b/include/oox/drawingml/clrschemecontext.hxx
index fc2a09159139..9208affd8534 100644
--- a/include/oox/drawingml/clrschemecontext.hxx
+++ b/include/oox/drawingml/clrschemecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
-#define OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/clrscheme.hxx"
@@ -57,6 +57,6 @@ private:
 
 } }
 
-#endif  //  OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index 220e8411e1e9..f5e1a661ca69 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_COLOR_HXX
-#define OOX_DRAWINGML_COLOR_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_COLOR_HXX
+#define INCLUDED_OOX_DRAWINGML_COLOR_HXX
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/include/oox/drawingml/colorchoicecontext.hxx b/include/oox/drawingml/colorchoicecontext.hxx
index ba28ee9e930f..5b0d28a0f091 100644
--- a/include/oox/drawingml/colorchoicecontext.hxx
+++ b/include/oox/drawingml/colorchoicecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
-#define OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
diff --git a/include/oox/drawingml/connectorshapecontext.hxx b/include/oox/drawingml/connectorshapecontext.hxx
index 5429fc8826b0..f91ba39e96ad 100644
--- a/include/oox/drawingml/connectorshapecontext.hxx
+++ b/include/oox/drawingml/connectorshapecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
-#define OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/shapecontext.hxx"
@@ -36,6 +36,6 @@ public:
 
 } }
 
-#endif  //  OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/customshapegeometry.hxx b/include/oox/drawingml/customshapegeometry.hxx
index db13be62aded..8d4c35933e6e 100644
--- a/include/oox/drawingml/customshapegeometry.hxx
+++ b/include/oox/drawingml/customshapegeometry.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
-#define OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
+#define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "oox/helper/propertymap.hxx"
@@ -66,6 +66,6 @@ private:
 
 } }
 
-#endif // OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
+#endif // INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/customshapeproperties.hxx b/include/oox/drawingml/customshapeproperties.hxx
index 00f47de76e21..2bbf0c34aa77 100644
--- a/include/oox/drawingml/customshapeproperties.hxx
+++ b/include/oox/drawingml/customshapeproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
-#define OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <boost/unordered_map.hpp>
@@ -184,6 +184,6 @@ private:
 
 } }
 
-#endif  //  OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
+#endif // INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/diagram/diagram.hxx b/include/oox/drawingml/diagram/diagram.hxx
index e37c1a44e42f..920c9f74b1e5 100644
--- a/include/oox/drawingml/diagram/diagram.hxx
+++ b/include/oox/drawingml/diagram/diagram.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_DIAGRAM_HXX
-#define OOX_DRAWINGML_DIAGRAM_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_DIAGRAM_DIAGRAM_HXX
+#define INCLUDED_OOX_DRAWINGML_DIAGRAM_DIAGRAM_HXX
 
 #include <rtl/ustring.hxx>
 #include "oox/drawingml/shape.hxx"
diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index 5ceac48ed2bb..fad74b5db3dc 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TYPES_HXX
-#define OOX_DRAWINGML_TYPES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_DRAWINGMLTYPES_HXX
+#define INCLUDED_OOX_DRAWINGML_DRAWINGMLTYPES_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/style/TabAlign.hpp>
diff --git a/include/oox/drawingml/effectproperties.hxx b/include/oox/drawingml/effectproperties.hxx
index 55c5ec34a20f..6aa005961cc1 100644
--- a/include/oox/drawingml/effectproperties.hxx
+++ b/include/oox/drawingml/effectproperties.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OOX_DRAWINGML_EFFECTPROPERTIES_HXX
-#define OOX_DRAWINGML_EFFECTPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
 
 #include "oox/drawingml/fillproperties.hxx"
 
diff --git a/include/oox/drawingml/effectpropertiescontext.hxx b/include/oox/drawingml/effectpropertiescontext.hxx
index 43a8dd9a959f..c127b651a67a 100644
--- a/include/oox/drawingml/effectpropertiescontext.hxx
+++ b/include/oox/drawingml/effectpropertiescontext.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/dllapi.h"
@@ -35,6 +35,6 @@ protected:
 
 } }
 
-#endif // OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/embeddedwavaudiofile.hxx b/include/oox/drawingml/embeddedwavaudiofile.hxx
index 97cebd54947b..7a4863ddb0c0 100644
--- a/include/oox/drawingml/embeddedwavaudiofile.hxx
+++ b/include/oox/drawingml/embeddedwavaudiofile.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX
-#define OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX
+#define INCLUDED_OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx
index 4a54fa327546..c2e27f667a34 100644
--- a/include/oox/drawingml/fillproperties.hxx
+++ b/include/oox/drawingml/fillproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_FILLPROPERTIES_HXX
-#define OOX_DRAWINGML_FILLPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_FILLPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_FILLPROPERTIES_HXX
 
 #include <map>
 #include <com/sun/star/graphic/XGraphic.hpp>
diff --git a/include/oox/drawingml/fillpropertiesgroupcontext.hxx b/include/oox/drawingml/fillpropertiesgroupcontext.hxx
index 139521bdd2a5..98592ca04c94 100644
--- a/include/oox/drawingml/fillpropertiesgroupcontext.hxx
+++ b/include/oox/drawingml/fillpropertiesgroupcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HPP
-#define OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HPP
+#ifndef INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX
 
 #include "oox/drawingml/colorchoicecontext.hxx"
 #include "oox/drawingml/fillproperties.hxx"
diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx
index c2aa54e0d839..18f78f1b031a 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
-#define OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/shapecontext.hxx"
@@ -103,6 +103,6 @@ private:
 
 } }
 
-#endif  //  OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/guidcontext.hxx b/include/oox/drawingml/guidcontext.hxx
index c13c9e8eaade..e029def6756d 100644
--- a/include/oox/drawingml/guidcontext.hxx
+++ b/include/oox/drawingml/guidcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_GUIDCONTEXT_HXX
-#define OOX_DRAWINGML_GUIDCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_GUIDCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_GUIDCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
diff --git a/include/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx
index 7ffdc04230a0..c1da26a7a462 100644
--- a/include/oox/drawingml/lineproperties.hxx
+++ b/include/oox/drawingml/lineproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_LINEPROPERTIES_HXX
-#define OOX_DRAWINGML_LINEPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
 
 #include "oox/drawingml/fillproperties.hxx"
 
diff --git a/include/oox/drawingml/linepropertiescontext.hxx b/include/oox/drawingml/linepropertiescontext.hxx
index 0d78aba02045..43c8aac3066c 100644
--- a/include/oox/drawingml/linepropertiescontext.hxx
+++ b/include/oox/drawingml/linepropertiescontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/dllapi.h"
@@ -46,6 +46,6 @@ protected:
 
 } }
 
-#endif // OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/objectdefaultcontext.hxx b/include/oox/drawingml/objectdefaultcontext.hxx
index 13e27a7b7f56..b12fec6d0474 100644
--- a/include/oox/drawingml/objectdefaultcontext.hxx
+++ b/include/oox/drawingml/objectdefaultcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
-#define OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
@@ -38,6 +38,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/scene3dcontext.hxx b/include/oox/drawingml/scene3dcontext.hxx
index d1478b928a65..8499910d8779 100644
--- a/include/oox/drawingml/scene3dcontext.hxx
+++ b/include/oox/drawingml/scene3dcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SCENE3DPROPERTIESCONTEXT_HPP
-#define OOX_DRAWINGML_SCENE3DPROPERTIESCONTEXT_HPP
+#ifndef INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
@@ -39,6 +39,6 @@ private:
 
 } }
 
-#endif // OOX_DRAWINGML_SCENE3DPROPERTIESCONTEXT_HPP
+#endif // INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 0631c0aa3470..d38da80f229c 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPE_HXX
-#define OOX_DRAWINGML_SHAPE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPE_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPE_HXX
 
 #include "oox/helper/propertymap.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
@@ -280,6 +280,6 @@ private:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SHAPE_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SHAPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/shape3dproperties.hxx b/include/oox/drawingml/shape3dproperties.hxx
index d1891402757c..01d854fe90db 100644
--- a/include/oox/drawingml/shape3dproperties.hxx
+++ b/include/oox/drawingml/shape3dproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX
-#define OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX
 
 #include <map>
 #include <com/sun/star/graphic/XGraphic.hpp>
diff --git a/include/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx
index 469670991319..eb9ba5522eef 100644
--- a/include/oox/drawingml/shapecontext.hxx
+++ b/include/oox/drawingml/shapecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPECONTEXT_HXX
-#define OOX_DRAWINGML_SHAPECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPECONTEXT_HXX
 
 #include <com/sun/star/drawing/XShapes.hpp>
 
@@ -47,6 +47,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SHAPECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/shapegroupcontext.hxx b/include/oox/drawingml/shapegroupcontext.hxx
index 9a199589802a..4480a7a07d5f 100644
--- a/include/oox/drawingml/shapegroupcontext.hxx
+++ b/include/oox/drawingml/shapegroupcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
-#define OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/shapecontext.hxx"
@@ -41,6 +41,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/shapepropertiescontext.hxx b/include/oox/drawingml/shapepropertiescontext.hxx
index ac4f9d7589c9..56f016b0b1e3 100644
--- a/include/oox/drawingml/shapepropertiescontext.hxx
+++ b/include/oox/drawingml/shapepropertiescontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/shape.hxx"
@@ -38,6 +38,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx
index c0c8e723b63d..6c0bbdf9586c 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
-#define OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
 
 #include "oox/helper/propertymap.hxx"
 #include "oox/dllapi.h"
diff --git a/include/oox/drawingml/shapestylecontext.hxx b/include/oox/drawingml/shapestylecontext.hxx
index e7b888fa9a6c..d59277a8f335 100644
--- a/include/oox/drawingml/shapestylecontext.hxx
+++ b/include/oox/drawingml/shapestylecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
-#define OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/core/contexthandler2.hxx"
@@ -39,6 +39,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/spdefcontext.hxx b/include/oox/drawingml/spdefcontext.hxx
index 00906e1458a2..e3a0fa71ad1c 100644
--- a/include/oox/drawingml/spdefcontext.hxx
+++ b/include/oox/drawingml/spdefcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SPDEFCONTEXT_HXX
-#define OOX_DRAWINGML_SPDEFCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/core/contexthandler2.hxx"
@@ -37,6 +37,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SPDEFCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/table/tablecell.hxx b/include/oox/drawingml/table/tablecell.hxx
index 9bb721f8599a..5253c31b74ff 100644
--- a/include/oox/drawingml/table/tablecell.hxx
+++ b/include/oox/drawingml/table/tablecell.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLECELL_HXX
-#define OOX_DRAWINGML_TABLECELL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLECELL_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLECELL_HXX
 
 #include "oox/helper/propertymap.hxx"
 #include "oox/drawingml/color.hxx"
@@ -110,6 +110,6 @@ private:
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLECELL_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLECELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/table/tableproperties.hxx b/include/oox/drawingml/table/tableproperties.hxx
index da5462ba0da7..e8aaf7e09556 100644
--- a/include/oox/drawingml/table/tableproperties.hxx
+++ b/include/oox/drawingml/table/tableproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLEPROPERTIES_HXX
-#define OOX_DRAWINGML_TABLEPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
 
 #include "oox/drawingml/table/tablerow.hxx"
 #include "oox/drawingml/table/tablestyle.hxx"
@@ -75,6 +75,6 @@ private:
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLEPROPERTIES_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/table/tablerow.hxx b/include/oox/drawingml/table/tablerow.hxx
index 299ffabfd8b1..51e14897bcb9 100644
--- a/include/oox/drawingml/table/tablerow.hxx
+++ b/include/oox/drawingml/table/tablerow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLEROW_HXX
-#define OOX_DRAWINGML_TABLEROW_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
 
 #include "oox/drawingml/table/tablecell.hxx"
 #include <vector>
@@ -44,6 +44,6 @@ private:
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLEROW_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/table/tablestyle.hxx b/include/oox/drawingml/table/tablestyle.hxx
index b31b5891a32b..5ecd4db8e20e 100644
--- a/include/oox/drawingml/table/tablestyle.hxx
+++ b/include/oox/drawingml/table/tablestyle.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLESTYLE_HXX
-#define OOX_DRAWINGML_TABLESTYLE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
 
 #include "oox/drawingml/table/tablestylepart.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
@@ -80,6 +80,6 @@ private:
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLESTYLE_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/table/tablestylelist.hxx b/include/oox/drawingml/table/tablestylelist.hxx
index 320609d064d9..624a453ded19 100644
--- a/include/oox/drawingml/table/tablestylelist.hxx
+++ b/include/oox/drawingml/table/tablestylelist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLESTYLELIST_HXX
-#define OOX_DRAWINGML_TABLESTYLELIST_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELIST_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELIST_HXX
 
 #include <rtl/ustring.hxx>
 #include <boost/shared_ptr.hpp>
@@ -49,6 +49,6 @@ typedef boost::shared_ptr< TableStyleList > TableStyleListPtr;
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLESTYLELIST_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx b/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx
index c145d21ae772..15a1b8ad7df7 100644
--- a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx
+++ b/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLESTYLELISTFRAGMENTHANDLER_HXX
-#define OOX_DRAWINGML_TABLESTYLELISTFRAGMENTHANDLER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX
 
 #include "oox/drawingml/table/tablestylelist.hxx"
 #include "oox/core/fragmenthandler2.hxx"
diff --git a/include/oox/drawingml/table/tablestylepart.hxx b/include/oox/drawingml/table/tablestylepart.hxx
index abfb21c890d9..5eb0a0934119 100644
--- a/include/oox/drawingml/table/tablestylepart.hxx
+++ b/include/oox/drawingml/table/tablestylepart.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLESTYLEPART_HXX
-#define OOX_DRAWINGML_TABLESTYLEPART_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLEPART_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLEPART_HXX
 
 #include <rtl/ustring.hxx>
 #include <boost/optional.hpp>
@@ -68,6 +68,6 @@ private:
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLESTYLEPART_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLEPART_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textbody.hxx b/include/oox/drawingml/textbody.hxx
index 0c79fd9e5a7c..0bcec9021ab8 100644
--- a/include/oox/drawingml/textbody.hxx
+++ b/include/oox/drawingml/textbody.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTBODY_HXX
-#define OOX_DRAWINGML_TEXTBODY_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX
 
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "oox/drawingml/textbodyproperties.hxx"
@@ -68,6 +68,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTBODY_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textbodycontext.hxx b/include/oox/drawingml/textbodycontext.hxx
index c0a5e759b536..9304ef07352f 100644
--- a/include/oox/drawingml/textbodycontext.hxx
+++ b/include/oox/drawingml/textbodycontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
 
 #include <com/sun/star/text/XText.hpp>
 
@@ -57,6 +57,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textbodyproperties.hxx b/include/oox/drawingml/textbodyproperties.hxx
index f8800be29659..306a278e8ba7 100644
--- a/include/oox/drawingml/textbodyproperties.hxx
+++ b/include/oox/drawingml/textbodyproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTBODYPROPERTIES_HXX
-#define OOX_DRAWINGML_TEXTBODYPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIES_HXX
 
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include "oox/helper/helper.hxx"
diff --git a/include/oox/drawingml/textbodypropertiescontext.hxx b/include/oox/drawingml/textbodypropertiescontext.hxx
index 2c0ba15e106a..b14169c865a3 100644
--- a/include/oox/drawingml/textbodypropertiescontext.hxx
+++ b/include/oox/drawingml/textbodypropertiescontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
@@ -41,6 +41,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textcharacterproperties.hxx b/include/oox/drawingml/textcharacterproperties.hxx
index 2e519c95f5b8..309d28c0c23c 100644
--- a/include/oox/drawingml/textcharacterproperties.hxx
+++ b/include/oox/drawingml/textcharacterproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX
-#define OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX
 
 #include "oox/helper/helper.hxx"
 #include "oox/helper/propertymap.hxx"
diff --git a/include/oox/drawingml/textcharacterpropertiescontext.hxx b/include/oox/drawingml/textcharacterpropertiescontext.hxx
index c6efcbded67f..d7e1bd06d373 100644
--- a/include/oox/drawingml/textcharacterpropertiescontext.hxx
+++ b/include/oox/drawingml/textcharacterpropertiescontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
@@ -42,6 +42,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textfield.hxx b/include/oox/drawingml/textfield.hxx
index 0dbfdea2fb31..f031f91fe28d 100644
--- a/include/oox/drawingml/textfield.hxx
+++ b/include/oox/drawingml/textfield.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTFIELD_HXX
-#define OOX_DRAWINGML_TEXTFIELD_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTFIELD_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTFIELD_HXX
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/include/oox/drawingml/textfieldcontext.hxx b/include/oox/drawingml/textfieldcontext.hxx
index 3b0314b177ec..ee6284b952e0 100644
--- a/include/oox/drawingml/textfieldcontext.hxx
+++ b/include/oox/drawingml/textfieldcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
diff --git a/include/oox/drawingml/textfont.hxx b/include/oox/drawingml/textfont.hxx
index 95a7a1716a0d..a069057b90fb 100644
--- a/include/oox/drawingml/textfont.hxx
+++ b/include/oox/drawingml/textfont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGNML_TEXTFONT_HXX
-#define OOX_DRAWINGNML_TEXTFONT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTFONT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTFONT_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/include/oox/drawingml/textliststyle.hxx b/include/oox/drawingml/textliststyle.hxx
index c8a1f1b625be..b7b33fb17f30 100644
--- a/include/oox/drawingml/textliststyle.hxx
+++ b/include/oox/drawingml/textliststyle.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTLISTSTYLE_HXX
-#define OOX_DRAWINGML_TEXTLISTSTYLE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX
 
 #include "oox/drawingml/textparagraphproperties.hxx"
 #include "oox/helper/refvector.hxx"
@@ -56,6 +56,6 @@ typedef boost::shared_ptr< TextListStyle > TextListStylePtr;
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTLISTSTYLE_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textliststylecontext.hxx b/include/oox/drawingml/textliststylecontext.hxx
index 41bdcb717288..46c8c682ea48 100644
--- a/include/oox/drawingml/textliststylecontext.hxx
+++ b/include/oox/drawingml/textliststylecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
-#define OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
 
 #include "oox/drawingml/textliststyle.hxx"
 #include "oox/core/contexthandler2.hxx"
@@ -39,6 +39,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textparagraph.hxx b/include/oox/drawingml/textparagraph.hxx
index 190cb60290e9..b58a5ee3075f 100644
--- a/include/oox/drawingml/textparagraph.hxx
+++ b/include/oox/drawingml/textparagraph.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTPARAGRAPH_HXX
-#define OOX_DRAWINGML_TEXTPARAGRAPH_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPH_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPH_HXX
 
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/XText.hpp>
@@ -66,6 +66,6 @@ typedef boost::shared_ptr< TextParagraph > TextParagraphPtr;
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTPARAGRAPH_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textparagraphproperties.hxx b/include/oox/drawingml/textparagraphproperties.hxx
index 1cb8215a3fc1..9a7df53da893 100644
--- a/include/oox/drawingml/textparagraphproperties.hxx
+++ b/include/oox/drawingml/textparagraphproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
-#define OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
@@ -123,6 +123,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textparagraphpropertiescontext.hxx b/include/oox/drawingml/textparagraphpropertiescontext.hxx
index 12b8f1b4aa05..b17c3310f73e 100644
--- a/include/oox/drawingml/textparagraphpropertiescontext.hxx
+++ b/include/oox/drawingml/textparagraphpropertiescontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
 
 #include <list>
 
@@ -52,6 +52,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textrun.hxx b/include/oox/drawingml/textrun.hxx
index 94a2c0201709..ec4390dcf2f7 100644
--- a/include/oox/drawingml/textrun.hxx
+++ b/include/oox/drawingml/textrun.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTRUN_HXX
-#define OOX_DRAWINGML_TEXTRUN_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX
 
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/XText.hpp>
@@ -57,6 +57,6 @@ typedef boost::shared_ptr< TextRun > TextRunPtr;
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTRUN_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textspacing.hxx b/include/oox/drawingml/textspacing.hxx
index c85936283b4b..e36ca727b6ad 100644
--- a/include/oox/drawingml/textspacing.hxx
+++ b/include/oox/drawingml/textspacing.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGNML__TEXTSPACING_HXX
-#define OOX_DRAWINGNML__TEXTSPACING_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTSPACING_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTSPACING_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx
index a95cb8282ca7..9f8fedb8a914 100644
--- a/include/oox/drawingml/theme.hxx
+++ b/include/oox/drawingml/theme.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_THEME_HXX
-#define OOX_DRAWINGML_THEME_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_THEME_HXX
+#define INCLUDED_OOX_DRAWINGML_THEME_HXX
 
 #include "oox/drawingml/clrscheme.hxx"
 #include "oox/drawingml/shape.hxx"
diff --git a/include/oox/drawingml/themeelementscontext.hxx b/include/oox/drawingml/themeelementscontext.hxx
index 14bc601e157f..b4e8579fe406 100644
--- a/include/oox/drawingml/themeelementscontext.hxx
+++ b/include/oox/drawingml/themeelementscontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
-#define OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx
index 61062775fa37..09fec7e3bfb2 100644
--- a/include/oox/drawingml/themefragmenthandler.hxx
+++ b/include/oox/drawingml/themefragmenthandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
-#define OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/dllapi.h"
diff --git a/include/oox/drawingml/transform2dcontext.hxx b/include/oox/drawingml/transform2dcontext.hxx
index a3ad02164a13..4636f45e48da 100644
--- a/include/oox/drawingml/transform2dcontext.hxx
+++ b/include/oox/drawingml/transform2dcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TRANSFORM2DCONTEXT_HXX
-#define OOX_DRAWINGML_TRANSFORM2DCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TRANSFORM2DCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TRANSFORM2DCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx
index 21edb23fea70..fd4ccd83aecc 100644
--- a/include/oox/dump/dffdumper.hxx
+++ b/include/oox/dump/dffdumper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DUMP_DFFDUMPER_HXX
-#define OOX_DUMP_DFFDUMPER_HXX
+#ifndef INCLUDED_OOX_DUMP_DFFDUMPER_HXX
+#define INCLUDED_OOX_DUMP_DFFDUMPER_HXX
 
 #include "oox/dump/dumperbase.hxx"
 
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 6219ec9892f4..68e3d32cb646 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DUMP_DUMPERBASE_HXX
-#define OOX_DUMP_DUMPERBASE_HXX
+#ifndef INCLUDED_OOX_DUMP_DUMPERBASE_HXX
+#define INCLUDED_OOX_DUMP_DUMPERBASE_HXX
 
 #include <math.h>
 #include <vector>
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index 223c58d27b7b..2a90dbb8a61e 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DUMP_OLEDUMPER_HXX
-#define OOX_DUMP_OLEDUMPER_HXX
+#ifndef INCLUDED_OOX_DUMP_OLEDUMPER_HXX
+#define INCLUDED_OOX_DUMP_OLEDUMPER_HXX
 
 #include "oox/helper/storagebase.hxx"
 #include "oox/dump/dumperbase.hxx"
diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx
index 43f39002059b..f77e3dd54bff 100644
--- a/include/oox/dump/pptxdumper.hxx
+++ b/include/oox/dump/pptxdumper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DUMP_PPTXDUMPER_HXX
-#define OOX_DUMP_PPTXDUMPER_HXX
+#ifndef INCLUDED_OOX_DUMP_PPTXDUMPER_HXX
+#define INCLUDED_OOX_DUMP_PPTXDUMPER_HXX
 
 #include "oox/dump/dumperbase.hxx"
 
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index ffd24d4de808..06a6ef5d42da 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DUMP_XLSBDUMPER_HXX
-#define OOX_DUMP_XLSBDUMPER_HXX
+#ifndef INCLUDED_OOX_DUMP_XLSBDUMPER_HXX
+#define INCLUDED_OOX_DUMP_XLSBDUMPER_HXX
 
 #include "oox/dump/dumperbase.hxx"
 
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index 40ea87f62b0b..237b410c686d 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OOX_EXPORT_CHART_HXX_
-#define _OOX_EXPORT_CHART_HXX_
+#ifndef INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX
+#define INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX
 
 #include <oox/dllapi.h>
 #include <com/sun/star/uno/XReference.hpp>
@@ -191,6 +191,6 @@ public:
 
 }}
 
-#endif /* ndef _OOX_EXPORT_CHART_HXX_ */
+#endif /* ndef INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index b644aa3cd002..f5a89dd3c37f 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OOX_EXPORT_DRAWINGML_HXX_
-#define _OOX_EXPORT_DRAWINGML_HXX_
+#ifndef INCLUDED_OOX_EXPORT_DRAWINGML_HXX
+#define INCLUDED_OOX_EXPORT_DRAWINGML_HXX
 
 #include <oox/dllapi.h>
 #include <sax/fshelper.hxx>
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index 39b4c0d9ec72..750d74f2a8dc 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OOX_EXPORT_SHAPES_HXX_
-#define _OOX_EXPORT_SHAPES_HXX_
+#ifndef INCLUDED_OOX_EXPORT_SHAPES_HXX
+#define INCLUDED_OOX_EXPORT_SHAPES_HXX
 
 #include <oox/dllapi.h>
 #include <com/sun/star/uno/XReference.hpp>
@@ -165,6 +165,6 @@ public:
 
 }}
 
-#endif /* ndef _OOX_EXPORT_SHAPES_HXX_ */
+#endif /* ndef INCLUDED_OOX_EXPORT_SHAPES_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index a712254a7478..657ee4d38e98 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OOX_EXPORT_UTILS_HXX_
-#define _OOX_EXPORT_UTILS_HXX_
+#ifndef INCLUDED_OOX_EXPORT_UTILS_HXX
+#define INCLUDED_OOX_EXPORT_UTILS_HXX
 
 #define I32S(x) OString::number( (sal_Int32) x ).getStr()
 #define I64S(x) OString::number( (sal_Int64) x ).getStr()
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 7a5f7ec96351..8121e3bcca46 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OOX_EXPORT_VMLEXPORT_HXX_
-#define _OOX_EXPORT_VMLEXPORT_HXX_
+#ifndef INCLUDED_OOX_EXPORT_VMLEXPORT_HXX
+#define INCLUDED_OOX_EXPORT_VMLEXPORT_HXX
 
 #include <oox/dllapi.h>
 #include <oox/export/drawingml.hxx>
diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx
index 0555ed487376..8654a7480c69 100644
--- a/include/oox/helper/attributelist.hxx
+++ b/include/oox/helper/attributelist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_ATTRIBUTELIST_HXX
-#define OOX_HELPER_ATTRIBUTELIST_HXX
+#ifndef INCLUDED_OOX_HELPER_ATTRIBUTELIST_HXX
+#define INCLUDED_OOX_HELPER_ATTRIBUTELIST_HXX
 
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 45371673026e..4488ad665fe0 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_BINARYINPUTSTREAM_HXX
-#define OOX_HELPER_BINARYINPUTSTREAM_HXX
+#ifndef INCLUDED_OOX_HELPER_BINARYINPUTSTREAM_HXX
+#define INCLUDED_OOX_HELPER_BINARYINPUTSTREAM_HXX
 
 #include <vector>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index e4e41119ba46..8899117b253e 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_BINARYOUTPUTSTREAM_HXX
-#define OOX_HELPER_BINARYOUTPUTSTREAM_HXX
+#ifndef INCLUDED_OOX_HELPER_BINARYOUTPUTSTREAM_HXX
+#define INCLUDED_OOX_HELPER_BINARYOUTPUTSTREAM_HXX
 
 #include "oox/helper/binarystreambase.hxx"
 
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index 7ece97a1fc08..65b4827dda3b 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_BINARYSTREAMBASE_HXX
-#define OOX_HELPER_BINARYSTREAMBASE_HXX
+#ifndef INCLUDED_OOX_HELPER_BINARYSTREAMBASE_HXX
+#define INCLUDED_OOX_HELPER_BINARYSTREAMBASE_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <boost/shared_ptr.hpp>
diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx
index fdb6ec99e287..10590a93e963 100644
--- a/include/oox/helper/containerhelper.hxx
+++ b/include/oox/helper/containerhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_CONTAINERHELPER_HXX
-#define OOX_HELPER_CONTAINERHELPER_HXX
+#ifndef INCLUDED_OOX_HELPER_CONTAINERHELPER_HXX
+#define INCLUDED_OOX_HELPER_CONTAINERHELPER_HXX
 
 #include <map>
 #include <vector>
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index 0681716bc84f..9ba378ad1b7b 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_GRAPHICHELPER_HXX
-#define OOX_HELPER_GRAPHICHELPER_HXX
+#ifndef INCLUDED_OOX_HELPER_GRAPHICHELPER_HXX
+#define INCLUDED_OOX_HELPER_GRAPHICHELPER_HXX
 
 #include <deque>
 #include <map>
diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx
index f86b3d3e8cb2..9f4cac598e2d 100644
--- a/include/oox/helper/helper.hxx
+++ b/include/oox/helper/helper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_HELPER_HXX
-#define OOX_HELPER_HELPER_HXX
+#ifndef INCLUDED_OOX_HELPER_HELPER_HXX
+#define INCLUDED_OOX_HELPER_HELPER_HXX
 
 #include <algorithm>
 #include <limits>
diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx
index 253279a4c05a..b008d5aed10f 100644
--- a/include/oox/helper/modelobjecthelper.hxx
+++ b/include/oox/helper/modelobjecthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_MODELOBJECTHELPER_HXX
-#define OOX_HELPER_MODELOBJECTHELPER_HXX
+#ifndef INCLUDED_OOX_HELPER_MODELOBJECTHELPER_HXX
+#define INCLUDED_OOX_HELPER_MODELOBJECTHELPER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include "oox/dllapi.h"
diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx
index ba0bdcfbb5c9..425f519f23c7 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_PROGRESSBAR_HXX
-#define OOX_HELPER_PROGRESSBAR_HXX
+#ifndef INCLUDED_OOX_HELPER_PROGRESSBAR_HXX
+#define INCLUDED_OOX_HELPER_PROGRESSBAR_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx
index 24fbff581c87..90811d59f80b 100644
--- a/include/oox/helper/propertymap.hxx
+++ b/include/oox/helper/propertymap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_PROPERTYMAP_HXX
-#define OOX_HELPER_PROPERTYMAP_HXX
+#ifndef INCLUDED_OOX_HELPER_PROPERTYMAP_HXX
+#define INCLUDED_OOX_HELPER_PROPERTYMAP_HXX
 
 #include <vector>
 #include <map>
diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx
index f4aa0b42eeec..7aee8ab2cf7c 100644
--- a/include/oox/helper/propertyset.hxx
+++ b/include/oox/helper/propertyset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_PROPERTYSET_HXX
-#define OOX_HELPER_PROPERTYSET_HXX
+#ifndef INCLUDED_OOX_HELPER_PROPERTYSET_HXX
+#define INCLUDED_OOX_HELPER_PROPERTYSET_HXX
 
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx
index 251f4eccb5f8..a9fdfe071e35 100644
--- a/include/oox/helper/refmap.hxx
+++ b/include/oox/helper/refmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_REFMAP_HXX
-#define OOX_HELPER_REFMAP_HXX
+#ifndef INCLUDED_OOX_HELPER_REFMAP_HXX
+#define INCLUDED_OOX_HELPER_REFMAP_HXX
 
 #include <map>
 #include <boost/bind.hpp>
diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx
index c0c5ad22d374..dd9fa14b7646 100644
--- a/include/oox/helper/refvector.hxx
+++ b/include/oox/helper/refvector.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_REFVECTOR_HXX
-#define OOX_HELPER_REFVECTOR_HXX
+#ifndef INCLUDED_OOX_HELPER_REFVECTOR_HXX
+#define INCLUDED_OOX_HELPER_REFVECTOR_HXX
 
 #include <vector>
 #include <boost/bind.hpp>
diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx
index f318f01b4768..8df2f786fa9b 100644
--- a/include/oox/helper/storagebase.hxx
+++ b/include/oox/helper/storagebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_STORAGEBASE_HXX
-#define OOX_HELPER_STORAGEBASE_HXX
+#ifndef INCLUDED_OOX_HELPER_STORAGEBASE_HXX
+#define INCLUDED_OOX_HELPER_STORAGEBASE_HXX
 
 #include <vector>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx
index 16a2d5145e9d..af412dede090 100644
--- a/include/oox/helper/textinputstream.hxx
+++ b/include/oox/helper/textinputstream.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_TEXTINPUTSTREAM_HXX
-#define OOX_HELPER_TEXTINPUTSTREAM_HXX
+#ifndef INCLUDED_OOX_HELPER_TEXTINPUTSTREAM_HXX
+#define INCLUDED_OOX_HELPER_TEXTINPUTSTREAM_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx
index e46df41387d7..59dc01c5a4c7 100644
--- a/include/oox/helper/zipstorage.hxx
+++ b/include/oox/helper/zipstorage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_HELPER_ZIPSTORAGE_HXX
-#define OOX_HELPER_ZIPSTORAGE_HXX
+#ifndef INCLUDED_OOX_HELPER_ZIPSTORAGE_HXX
+#define INCLUDED_OOX_HELPER_ZIPSTORAGE_HXX
 
 #include "oox/helper/storagebase.hxx"
 
diff --git a/include/oox/mathml/export.hxx b/include/oox/mathml/export.hxx
index 3a0f3788a77f..49a2afe7e3b0 100644
--- a/include/oox/mathml/export.hxx
+++ b/include/oox/mathml/export.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef _OOXMLEXPORT_HXX
-#define _OOXMLEXPORT_HXX
+#ifndef INCLUDED_OOX_MATHML_EXPORT_HXX
+#define INCLUDED_OOX_MATHML_EXPORT_HXX
 
 #include <sax/fshelper.hxx>
 #include <rtl/strbuf.hxx>
diff --git a/include/oox/mathml/import.hxx b/include/oox/mathml/import.hxx
index fe436d41a047..2617ff53e67c 100644
--- a/include/oox/mathml/import.hxx
+++ b/include/oox/mathml/import.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef _STARMATHIMPORT_HXX
-#define _STARMATHIMPORT_HXX
+#ifndef INCLUDED_OOX_MATHML_IMPORT_HXX
+#define INCLUDED_OOX_MATHML_IMPORT_HXX
 
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <tools/gen.hxx>
diff --git a/include/oox/mathml/importutils.hxx b/include/oox/mathml/importutils.hxx
index c3c16482164f..013484fcf405 100644
--- a/include/oox/mathml/importutils.hxx
+++ b/include/oox/mathml/importutils.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef _STARMATHIMPORTUTILS_HXX
-#define _STARMATHIMPORTUTILS_HXX
+#ifndef INCLUDED_OOX_MATHML_IMPORTUTILS_HXX
+#define INCLUDED_OOX_MATHML_IMPORTUTILS_HXX
 
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 #include <oox/token/tokens.hxx>
diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx
index 42be3661d2f3..2ad30d523993 100644
--- a/include/oox/ole/axbinaryreader.hxx
+++ b/include/oox/ole/axbinaryreader.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_AXBINARYREADER_HXX
-#define OOX_OLE_AXBINARYREADER_HXX
+#ifndef INCLUDED_OOX_OLE_AXBINARYREADER_HXX
+#define INCLUDED_OOX_OLE_AXBINARYREADER_HXX
 
 #include <utility>
 #include "oox/helper/binaryinputstream.hxx"
diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx
index 97f740fd8dc8..2ef0b720fcfa 100644
--- a/include/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OOX_OLE_AXBINARYWRITER_HXX
-#define OOX_OLE_AXBINARYWRITER_HXX
+#ifndef INCLUDED_OOX_OLE_AXBINARYWRITER_HXX
+#define INCLUDED_OOX_OLE_AXBINARYWRITER_HXX
 
 #include <utility>
 #include "oox/helper/binaryoutputstream.hxx"
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 7f657b11c77a..8c24d2e29c1a 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_AXCONTROL_HXX
-#define OOX_OLE_AXCONTROL_HXX
+#ifndef INCLUDED_OOX_OLE_AXCONTROL_HXX
+#define INCLUDED_OOX_OLE_AXCONTROL_HXX
 
 #include <boost/shared_ptr.hpp>
 #include "oox/helper/binarystreambase.hxx"
diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx
index 653f23c30479..a43019e07210 100644
--- a/include/oox/ole/axcontrolfragment.hxx
+++ b/include/oox/ole/axcontrolfragment.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_AXCONTROLFRAGMENT_HXX
-#define OOX_OLE_AXCONTROLFRAGMENT_HXX
+#ifndef INCLUDED_OOX_OLE_AXCONTROLFRAGMENT_HXX
+#define INCLUDED_OOX_OLE_AXCONTROLFRAGMENT_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 
diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx
index 9dbec1786261..09dbba015922 100644
--- a/include/oox/ole/axfontdata.hxx
+++ b/include/oox/ole/axfontdata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_AXFONTDATA_HXX
-#define OOX_OLE_AXFONTDATA_HXX
+#ifndef INCLUDED_OOX_OLE_AXFONTDATA_HXX
+#define INCLUDED_OOX_OLE_AXFONTDATA_HXX
 
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/binaryoutputstream.hxx"
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 85cca196c4f0..038b7885e7ce 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_OLEHELPER_HXX
-#define OOX_OLE_OLEHELPER_HXX
+#ifndef INCLUDED_OOX_OLE_OLEHELPER_HXX
+#define INCLUDED_OOX_OLE_OLEHELPER_HXX
 
 #include <rtl/ustring.hxx>
 #include "oox/helper/binarystreambase.hxx"
diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx
index 9d97a8d95f71..1cde8dff5493 100644
--- a/include/oox/ole/oleobjecthelper.hxx
+++ b/include/oox/ole/oleobjecthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_OLEOBJECTHELPER_HXX
-#define OOX_OLE_OLEOBJECTHELPER_HXX
+#ifndef INCLUDED_OOX_OLE_OLEOBJECTHELPER_HXX
+#define INCLUDED_OOX_OLE_OLEOBJECTHELPER_HXX
 
 #include "oox/helper/binarystreambase.hxx"
 
diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx
index 1b48eab8213d..008ba6184890 100644
--- a/include/oox/ole/olestorage.hxx
+++ b/include/oox/ole/olestorage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_OLESTORAGE_HXX
-#define OOX_OLE_OLESTORAGE_HXX
+#ifndef INCLUDED_OOX_OLE_OLESTORAGE_HXX
+#define INCLUDED_OOX_OLE_OLESTORAGE_HXX
 
 #include "oox/helper/storagebase.hxx"
 
diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx
index 89e30badcfb4..e9135875854d 100644
--- a/include/oox/ole/vbacontrol.hxx
+++ b/include/oox/ole/vbacontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_VBACONTROL_HXX
-#define OOX_OLE_VBACONTROL_HXX
+#ifndef INCLUDED_OOX_OLE_VBACONTROL_HXX
+#define INCLUDED_OOX_OLE_VBACONTROL_HXX
 
 #include "oox/ole/axcontrol.hxx"
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx
index a8faee21ff6e..6d4f80ce02f2 100644
--- a/include/oox/ole/vbahelper.hxx
+++ b/include/oox/ole/vbahelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_VBAHELPER_HXX
-#define OOX_OLE_VBAHELPER_HXX
+#ifndef INCLUDED_OOX_OLE_VBAHELPER_HXX
+#define INCLUDED_OOX_OLE_VBAHELPER_HXX
 
 #include "oox/helper/binarystreambase.hxx"
 
diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx
index 7e0cd4986bd7..54da72eb7e58 100644
--- a/include/oox/ole/vbainputstream.hxx
+++ b/include/oox/ole/vbainputstream.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_VBAINPUTSTREAM_HXX
-#define OOX_OLE_VBAINPUTSTREAM_HXX
+#ifndef INCLUDED_OOX_OLE_VBAINPUTSTREAM_HXX
+#define INCLUDED_OOX_OLE_VBAINPUTSTREAM_HXX
 
 #include <vector>
 #include "oox/helper/binaryinputstream.hxx"
diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx
index 9c0cfd0a1812..01678bec5264 100644
--- a/include/oox/ole/vbamodule.hxx
+++ b/include/oox/ole/vbamodule.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_VBAMODULE_HXX
-#define OOX_OLE_VBAMODULE_HXX
+#ifndef INCLUDED_OOX_OLE_VBAMODULE_HXX
+#define INCLUDED_OOX_OLE_VBAMODULE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index 55ac3a8b280a..64fe2e7183dc 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_OLE_VBAPROJECT_HXX
-#define OOX_OLE_VBAPROJECT_HXX
+#ifndef INCLUDED_OOX_OLE_VBAPROJECT_HXX
+#define INCLUDED_OOX_OLE_VBAPROJECT_HXX
 
 #include <map>
 #include <com/sun/star/uno/XInterface.hpp>
diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx
index 05926d44b796..ae055c80913d 100644
--- a/include/oox/ppt/backgroundproperties.hxx
+++ b/include/oox/ppt/backgroundproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_POWERPOINT_BACKGROUNDPROPERTIES_HXX
-#define OOX_POWERPOINT_BACKGROUNDPROPERTIES_HXX
+#ifndef INCLUDED_OOX_PPT_BACKGROUNDPROPERTIES_HXX
+#define INCLUDED_OOX_PPT_BACKGROUNDPROPERTIES_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/drawingml/fillproperties.hxx"
@@ -39,6 +39,6 @@ protected:
 
 } }
 
-#endif // OOX_POWERPOINT_BACKGROUNDPROPERTIES_HXX
+#endif // INCLUDED_OOX_PPT_BACKGROUNDPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx
index 1095cd0223db..c32b8f6cc0d7 100644
--- a/include/oox/ppt/comments.hxx
+++ b/include/oox/ppt/comments.hxx
@@ -8,8 +8,8 @@
  */
 
 
-#ifndef OOX_PPT_COMMENTS_HXX
-#define OOX_PPT_COMMENTS_HXX
+#ifndef INCLUDED_OOX_PPT_COMMENTS_HXX
+#define INCLUDED_OOX_PPT_COMMENTS_HXX
 
 #include <vector>
 #include <com/sun/star/util/DateTime.hpp>
diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx
index ed913c8bbe2c..b00096f0386e 100644
--- a/include/oox/ppt/customshowlistcontext.hxx
+++ b/include/oox/ppt/customshowlistcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_POWERPOINT_CUSTOMSHOWLISTCONTEXT_HXX
-#define OOX_POWERPOINT_CUSTOMSHOWLISTCONTEXT_HXX
+#ifndef INCLUDED_OOX_PPT_CUSTOMSHOWLISTCONTEXT_HXX
+#define INCLUDED_OOX_PPT_CUSTOMSHOWLISTCONTEXT_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include <vector>
diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx
index f369c5e526b8..33c9412906fd 100644
--- a/include/oox/ppt/dgmimport.hxx
+++ b/include/oox/ppt/dgmimport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_POWERPOINT_QUICKDIAGRAMMINGIMPORT_HXX
-#define OOX_POWERPOINT_QUICKDIAGRAMMINGIMPORT_HXX
+#ifndef INCLUDED_OOX_PPT_DGMIMPORT_HXX
+#define INCLUDED_OOX_PPT_DGMIMPORT_HXX
 
 #include "oox/core/xmlfilterbase.hxx"
 
@@ -57,6 +57,6 @@ private:
 
 } }
 
-#endif // OOX_POWERPOINT_QUICKDIAGRAMMINGIMPORT_HXX
+#endif // INCLUDED_OOX_PPT_DGMIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx
index bf964fe5d310..0c5f942bc892 100644
--- a/include/oox/ppt/dgmlayout.hxx
+++ b/include/oox/ppt/dgmlayout.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_POWERPOINT_QUICKDIAGRAMMINGLAYOUT_HXX
-#define OOX_POWERPOINT_QUICKDIAGRAMMINGLAYOUT_HXX
+#ifndef INCLUDED_OOX_PPT_DGMLAYOUT_HXX
+#define INCLUDED_OOX_PPT_DGMLAYOUT_HXX
 
 #include "oox/core/xmlfilterbase.hxx"
 
@@ -58,6 +58,6 @@ private:
 
 } }
 
-#endif // OOX_POWERPOINT_QUICKDIAGRAMMINGLAYOUT_HXX
+#endif // INCLUDED_OOX_PPT_DGMLAYOUT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/headerfooter.hxx b/include/oox/ppt/headerfooter.hxx
index 4d0a3cb65f1d..54720915f9cc 100644
--- a/include/oox/ppt/headerfooter.hxx
+++ b/include/oox/ppt/headerfooter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_PPT_HEADERFOOTER
-#define OOX_PPT_HEADERFOOTER
+#ifndef INCLUDED_OOX_PPT_HEADERFOOTER_HXX
+#define INCLUDED_OOX_PPT_HEADERFOOTER_HXX
 
 #include <sal/types.h>
 
diff --git a/include/oox/ppt/pptgraphicshapecontext.hxx b/include/oox/ppt/pptgraphicshapecontext.hxx
index 99492d6d0e32..304b359fb865 100644
--- a/include/oox/ppt/pptgraphicshapecontext.hxx
+++ b/include/oox/ppt/pptgraphicshapecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_PPT_PPTGRAPHICSHAPECONTEXT_HXX
-#define OOX_PPT_PPTGRAPHICSHAPECONTEXT_HXX
+#ifndef INCLUDED_OOX_PPT_PPTGRAPHICSHAPECONTEXT_HXX
+#define INCLUDED_OOX_PPT_PPTGRAPHICSHAPECONTEXT_HXX
 
 #include "oox/drawingml/graphicshapecontext.hxx"
 
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index 035ea8cdc5c1..c218c0cfab03 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_POWERPOINT_POWERPOINTIMPORT_HXX
-#define OOX_POWERPOINT_POWERPOINTIMPORT_HXX
+#ifndef INCLUDED_OOX_PPT_PPTIMPORT_HXX
+#define INCLUDED_OOX_PPT_PPTIMPORT_HXX
 
 #include "oox/core/xmlfilterbase.hxx"
 
@@ -86,6 +86,6 @@ private:
 
 } }
 
-#endif // OOX_POWERPOINT_POWERPOINTIMPORT_HXX
+#endif // INCLUDED_OOX_PPT_PPTIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index 2a15dcdc17ca..f551d478e888 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_PPT_PRESENTATION_PPTSHAPE_HXX
-#define OOX_PPT_PRESENTATION_PPTSHAPE_HXX
+#ifndef INCLUDED_OOX_PPT_PPTSHAPE_HXX
+#define INCLUDED_OOX_PPT_PPTSHAPE_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/ppt/slidepersist.hxx"
@@ -70,6 +70,6 @@ protected:
 
 } }
 
-#endif  //  OOX_PPT_PRESENTATION_PPTSHAPE_HXX
+#endif // INCLUDED_OOX_PPT_PPTSHAPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/pptshapecontext.hxx b/include/oox/ppt/pptshapecontext.hxx
index 85c64433221e..4b225894ec07 100644
--- a/include/oox/ppt/pptshapecontext.hxx
+++ b/include/oox/ppt/pptshapecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_PPT_PPTSHAPECONTEXT_HXX
-#define OOX_PPT_PPTSHAPECONTEXT_HXX
+#ifndef INCLUDED_OOX_PPT_PPTSHAPECONTEXT_HXX
+#define INCLUDED_OOX_PPT_PPTSHAPECONTEXT_HXX
 
 #include "oox/drawingml/shapecontext.hxx"
 #include "oox/ppt/slidepersist.hxx"
@@ -36,6 +36,6 @@ public:
 
 } }
 
-#endif  //  OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
+#endif // INCLUDED_OOX_PPT_PPTSHAPECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx
index 6a9cd19d81a3..96dc727de417 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
-#define OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
+#ifndef INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
+#define INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 
 #include "oox/drawingml/shapegroupcontext.hxx"
 #include "oox/ppt/slidepersist.hxx"
@@ -51,6 +51,6 @@ protected:
 
 } }
 
-#endif  //  OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
+#endif // INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx
index eddf70dbf62c..43ad546b2bb6 100644
--- a/include/oox/ppt/pptshapepropertiescontext.hxx
+++ b/include/oox/ppt/pptshapepropertiescontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX
-#define OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX
 
 #include "oox/drawingml/shapepropertiescontext.hxx"
 
@@ -34,6 +34,6 @@ public:
 
 } }
 
-#endif  //  OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
+#endif // INCLUDED_OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx
index c1e9c1478ec6..25696b3f329f 100644
--- a/include/oox/ppt/slidemastertextstylescontext.hxx
+++ b/include/oox/ppt/slidemastertextstylescontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
-#define OOX_DRAWINGML_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
+#ifndef INCLUDED_OOX_PPT_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
+#define INCLUDED_OOX_PPT_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
 
 #include "oox/drawingml/theme.hxx"
 #include "oox/core/contexthandler.hxx"
@@ -40,6 +40,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
+#endif // INCLUDED_OOX_PPT_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 6f58d81813c3..38f144a57a61 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_POWERPOINT_SLIDEPERSIST_HXX
-#define OOX_POWERPOINT_SLIDEPERSIST_HXX
+#ifndef INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
+#define INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
 
 #include <boost/shared_ptr.hpp>
 #include "oox/drawingml/shape.hxx"
@@ -156,6 +156,6 @@ private:
 
 } }
 
-#endif // OOX_POWERPOINT_SLIDEPERSIST_HXX
+#endif // INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx
index 769cc0e03943..fc8e3ef8a893 100644
--- a/include/oox/ppt/timenode.hxx
+++ b/include/oox/ppt/timenode.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef OOX_DRAWINGML_TIMENODE_HXX
-#define OOX_DRAWINGML_TIMENODE_HXX
+#ifndef INCLUDED_OOX_PPT_TIMENODE_HXX
+#define INCLUDED_OOX_PPT_TIMENODE_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <vector>
diff --git a/include/oox/token/namespacemap.hxx b/include/oox/token/namespacemap.hxx
index 78eeaa93cc40..2d2f2f31e4f7 100644
--- a/include/oox/token/namespacemap.hxx
+++ b/include/oox/token/namespacemap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_TOKEN_NAMESPACEMAP_HXX
-#define OOX_TOKEN_NAMESPACEMAP_HXX
+#ifndef INCLUDED_OOX_TOKEN_NAMESPACEMAP_HXX
+#define INCLUDED_OOX_TOKEN_NAMESPACEMAP_HXX
 
 #include <map>
 #include <rtl/instance.hxx>
diff --git a/include/oox/token/propertynames.hxx b/include/oox/token/propertynames.hxx
index 931eaed0172b..f8e1bbe97d45 100644
--- a/include/oox/token/propertynames.hxx
+++ b/include/oox/token/propertynames.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_TOKEN_PROPERTYNAMES_HXX
-#define OOX_TOKEN_PROPERTYNAMES_HXX
+#ifndef INCLUDED_OOX_TOKEN_PROPERTYNAMES_HXX
+#define INCLUDED_OOX_TOKEN_PROPERTYNAMES_HXX
 
 #include <vector>
 #include <rtl/instance.hxx>
diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index fb9ebc590a1a..495fa2d6eb3e 100644
--- a/include/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_TOKEN_TOKENMAP_HXX
-#define OOX_TOKEN_TOKENMAP_HXX
+#ifndef INCLUDED_OOX_TOKEN_TOKENMAP_HXX
+#define INCLUDED_OOX_TOKEN_TOKENMAP_HXX
 
 #include <vector>
 #include <rtl/instance.hxx>
diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx
index 8d35e2521849..9ced842bb221 100644
--- a/include/oox/vml/vmldrawing.hxx
+++ b/include/oox/vml/vmldrawing.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_VML_VMLDRAWING_HXX
-#define OOX_VML_VMLDRAWING_HXX
+#ifndef INCLUDED_OOX_VML_VMLDRAWING_HXX
+#define INCLUDED_OOX_VML_VMLDRAWING_HXX
 
 #include <map>
 #include <memory>
diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx
index f0947998a092..36dbb7da6700 100644
--- a/include/oox/vml/vmldrawingfragment.hxx
+++ b/include/oox/vml/vmldrawingfragment.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_VML_VMLDRAWINGFRAGMENT_HXX
-#define OOX_VML_VMLDRAWINGFRAGMENT_HXX
+#ifndef INCLUDED_OOX_VML_VMLDRAWINGFRAGMENT_HXX
+#define INCLUDED_OOX_VML_VMLDRAWINGFRAGMENT_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/dllapi.h"
diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx
index 81b83eec10a6..a2fe15bc58f2 100644
--- a/include/oox/vml/vmlformatting.hxx
+++ b/include/oox/vml/vmlformatting.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_VML_VMLFORMATTING_HXX
-#define OOX_VML_VMLFORMATTING_HXX
+#ifndef INCLUDED_OOX_VML_VMLFORMATTING_HXX
+#define INCLUDED_OOX_VML_VMLFORMATTING_HXX
 
 #include "oox/helper/helper.hxx"
 #include "oox/dllapi.h"
diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx
index 7c8e13160722..059acd338c4c 100644
--- a/include/oox/vml/vmlinputstream.hxx
+++ b/include/oox/vml/vmlinputstream.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_VML_VMLINPUTSTREAM_HXX
-#define OOX_VML_VMLINPUTSTREAM_HXX
+#ifndef INCLUDED_OOX_VML_VMLINPUTSTREAM_HXX
+#define INCLUDED_OOX_VML_VMLINPUTSTREAM_HXX
 
 #include <com/sun/star/io/XInputStream.hpp>
 #include <cppuhelper/implbase1.hxx>
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index b40e211cc8be..90e40377b311 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_VML_VMLSHAPE_HXX
-#define OOX_VML_VMLSHAPE_HXX
+#ifndef INCLUDED_OOX_VML_VMLSHAPE_HXX
+#define INCLUDED_OOX_VML_VMLSHAPE_HXX
 
 #include <memory>
 #include <vector>
diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx
index 315cbf8e9665..637254e989c9 100644
--- a/include/oox/vml/vmlshapecontainer.hxx
+++ b/include/oox/vml/vmlshapecontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_VML_VMLSHAPECONTAINER_HXX
-#define OOX_VML_VMLSHAPECONTAINER_HXX
+#ifndef INCLUDED_OOX_VML_VMLSHAPECONTAINER_HXX
+#define INCLUDED_OOX_VML_VMLSHAPECONTAINER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include "oox/helper/refmap.hxx"
diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx
index 803674088e37..769eede4e361 100644
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_VML_VMLSHAPECONTEXT_HXX
-#define OOX_VML_VMLSHAPECONTEXT_HXX
+#ifndef INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX
+#define INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx
index 88e6ecbca872..483aa79142b1 100644
--- a/include/oox/vml/vmltextbox.hxx
+++ b/include/oox/vml/vmltextbox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_VML_VMLTEXTBOX_HXX
-#define OOX_VML_VMLTEXTBOX_HXX
+#ifndef INCLUDED_OOX_VML_VMLTEXTBOX_HXX
+#define INCLUDED_OOX_VML_VMLTEXTBOX_HXX
 
 #include <vector>
 #include <rtl/ustring.hxx>
diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx
index 37626d5249a7..0befe8847e78 100644
--- a/include/oox/vml/vmltextboxcontext.hxx
+++ b/include/oox/vml/vmltextboxcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_VML_VMLTEXTBOXCONTEXT_HXX
-#define OOX_VML_VMLTEXTBOXCONTEXT_HXX
+#ifndef INCLUDED_OOX_VML_VMLTEXTBOXCONTEXT_HXX
+#define INCLUDED_OOX_VML_VMLTEXTBOXCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/vml/vmltextbox.hxx"
diff --git a/include/osl/conditn.h b/include/osl/conditn.h
index 8803ee85f2dd..a5d3d6054d01 100644
--- a/include/osl/conditn.h
+++ b/include/osl/conditn.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _OSL_CONDITION_H_
-#define _OSL_CONDITION_H_
+#ifndef INCLUDED_OSL_CONDITN_H
+#define INCLUDED_OSL_CONDITN_H
 
 #include "sal/config.h"
 
@@ -83,6 +83,6 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition);
 }
 #endif
 
-#endif /* _OSL_CONDITION_H_ */
+#endif // INCLUDED_OSL_CONDITN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/conditn.hxx b/include/osl/conditn.hxx
index 449242273a7f..5ca0323c2aa8 100644
--- a/include/osl/conditn.hxx
+++ b/include/osl/conditn.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_CONDITN_HXX_
-#define _OSL_CONDITN_HXX_
+#ifndef INCLUDED_OSL_CONDITN_HXX
+#define INCLUDED_OSL_CONDITN_HXX
 
 #ifdef __cplusplus
 
@@ -116,6 +116,6 @@ namespace osl
 }
 
 #endif  /* __cplusplus */
-#endif  /* _OSL_CONDITN_HXX_ */
+#endif // INCLUDED_OSL_CONDITN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/detail/android-bootstrap.h b/include/osl/detail/android-bootstrap.h
index 71b407272fcf..002027a5d8a0 100644
--- a/include/osl/detail/android-bootstrap.h
+++ b/include/osl/detail/android-bootstrap.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef ANDROID_BOOSTRAP_H
-#define ANDROID_BOOSTRAP_H
+#ifndef INCLUDED_OSL_DETAIL_ANDROID_BOOTSTRAP_H
+#define INCLUDED_OSL_DETAIL_ANDROID_BOOTSTRAP_H
 
 #if defined(ANDROID)
 
diff --git a/include/osl/detail/component-mapping.h b/include/osl/detail/component-mapping.h
index 4a0f4796a7b3..61354f59eed8 100644
--- a/include/osl/detail/component-mapping.h
+++ b/include/osl/detail/component-mapping.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef COMPONENT_MAPPING_H
-#define COMPONENT_MAPPING_H
+#ifndef INCLUDED_OSL_DETAIL_COMPONENT_MAPPING_H
+#define INCLUDED_OSL_DETAIL_COMPONENT_MAPPING_H
 
 #ifdef DISABLE_DYNLOADING
 
@@ -37,6 +37,6 @@ const lib_to_component_mapping *lo_get_libmap(void);
 
 #endif /* DISABLE_DYNLOADING */
 
-#endif /* COMPONENT_MAPPING_H */
+#endif // INCLUDED_OSL_DETAIL_COMPONENT_MAPPING_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h
index b3bfee91ad25..883e63a04d6f 100644
--- a/include/osl/diagnose.h
+++ b/include/osl/diagnose.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _OSL_DIAGNOSE_H_
-#define _OSL_DIAGNOSE_H_
+#ifndef INCLUDED_OSL_DIAGNOSE_H
+#define INCLUDED_OSL_DIAGNOSE_H
 
 #include "sal/config.h"
 
@@ -199,6 +199,6 @@ SAL_DLLPUBLIC pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugM
 #define OSL_THIS_FUNC ""
 #endif
 
-#endif /* _OSL_DIAGNOSE_H_ */
+#endif // INCLUDED_OSL_DIAGNOSE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx
index c7a6aa827f38..3d697d46e7c0 100644
--- a/include/osl/diagnose.hxx
+++ b/include/osl/diagnose.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef OSL_DIAGNOSE_HXX_INCLUDED
-#define OSL_DIAGNOSE_HXX_INCLUDED
+#ifndef INCLUDED_OSL_DIAGNOSE_HXX
+#define INCLUDED_OSL_DIAGNOSE_HXX
 
 #include "sal/config.h"
 
@@ -206,6 +206,6 @@ private:
 
 /// @endcond
 
-#endif // ! defined(OSL_DIAGNOSE_HXX_INCLUDED)
+#endif // ! defined( INCLUDED_OSL_DIAGNOSE_HXX)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/endian.h b/include/osl/endian.h
index 82ec1eaca7b1..13389830e5ff 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_ENDIAN_H_
-#define _OSL_ENDIAN_H_
+#ifndef INCLUDED_OSL_ENDIAN_H
+#define INCLUDED_OSL_ENDIAN_H
 
 #include <sal/types.h>
 
@@ -221,6 +221,6 @@ extern "C" {
 }
 #endif
 
-#endif /*_OSL_ENDIAN_H_ */
+#endif // INCLUDED_OSL_ENDIAN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/file.h b/include/osl/file.h
index 44013bf2ead1..facbb26c5d14 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_FILE_H_
-#define _OSL_FILE_H_
+#ifndef INCLUDED_OSL_FILE_H
+#define INCLUDED_OSL_FILE_H
 
 #include "sal/config.h"
 
@@ -1633,7 +1633,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_createTempFile(
 }
 #endif
 
-#endif  /* _OSL_FILE_H_ */
+#endif // INCLUDED_OSL_FILE_H
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index c62ef8dbe29f..bdb5bda44e3c 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_FILE_HXX_
-#define _OSL_FILE_HXX_
+#ifndef INCLUDED_OSL_FILE_HXX
+#define INCLUDED_OSL_FILE_HXX
 
 #include "sal/config.h"
 
@@ -1974,6 +1974,6 @@ public:
 
 } /* namespace osl */
 
-#endif  /* _OSL_FILE_HXX_ */
+#endif // INCLUDED_OSL_FILE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/interlck.h b/include/osl/interlck.h
index 31212deed274..416704299ae2 100644
--- a/include/osl/interlck.h
+++ b/include/osl/interlck.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_INTERLOCK_H_
-#define _OSL_INTERLOCK_H_
+#ifndef INCLUDED_OSL_INTERLCK_H
+#define INCLUDED_OSL_INTERLCK_H
 
 #include "sal/config.h"
 
@@ -86,7 +86,7 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte
 #endif
 
 
-#endif  /* _OSL_INTERLOCK_H_ */
+#endif // INCLUDED_OSL_INTERLCK_H
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/module.h b/include/osl/module.h
index 09f2b17b401c..982e846b8724 100644
--- a/include/osl/module.h
+++ b/include/osl/module.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MODULE_H_
-#define _OSL_MODULE_H_
+#ifndef INCLUDED_OSL_MODULE_H
+#define INCLUDED_OSL_MODULE_H
 
 #include "sal/config.h"
 
@@ -246,6 +246,6 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress(
 }
 #endif
 
-#endif  /* _OSL_MODULE_H_  */
+#endif // INCLUDED_OSL_MODULE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/module.hxx b/include/osl/module.hxx
index 317579dc816b..98cd1e32c33d 100644
--- a/include/osl/module.hxx
+++ b/include/osl/module.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MODULE_HXX_
-#define _OSL_MODULE_HXX_
+#ifndef INCLUDED_OSL_MODULE_HXX
+#define INCLUDED_OSL_MODULE_HXX
 
 #include <rtl/ustring.hxx>
 #include <osl/module.h>
diff --git a/include/osl/mutex.h b/include/osl/mutex.h
index 1336d4fcea95..98d897ae8b32 100644
--- a/include/osl/mutex.h
+++ b/include/osl/mutex.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MUTEX_H_
-#define _OSL_MUTEX_H_
+#ifndef INCLUDED_OSL_MUTEX_H
+#define INCLUDED_OSL_MUTEX_H
 
 #include "sal/config.h"
 
@@ -69,6 +69,6 @@ SAL_DLLPUBLIC oslMutex * SAL_CALL osl_getGlobalMutex(void);
 }
 #endif
 
-#endif  /* _OSL_MUTEX_H_ */
+#endif // INCLUDED_OSL_MUTEX_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index 9fab63fb27c3..55eb7414b038 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MUTEX_HXX_
-#define _OSL_MUTEX_HXX_
+#ifndef INCLUDED_OSL_MUTEX_HXX
+#define INCLUDED_OSL_MUTEX_HXX
 
 #ifdef __cplusplus
 
@@ -241,6 +241,6 @@ namespace osl
 }
 
 #endif  /* __cplusplus */
-#endif  /* _OSL_MUTEX_HXX_ */
+#endif // INCLUDED_OSL_MUTEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/nlsupport.h b/include/osl/nlsupport.h
index 9af93d9237ec..9173151f4054 100644
--- a/include/osl/nlsupport.h
+++ b/include/osl/nlsupport.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _OSL_NLSUPPORT_H_
-#define _OSL_NLSUPPORT_H_
+#ifndef INCLUDED_OSL_NLSUPPORT_H
+#define INCLUDED_OSL_NLSUPPORT_H
 
 #include "sal/config.h"
 
@@ -51,7 +51,7 @@ SAL_DLLPUBLIC rtl_TextEncoding SAL_CALL osl_getTextEncodingFromLocale(
 }
 #endif
 
-#endif  /* _OSL_NLSUPPORT_H_ */
+#endif // INCLUDED_OSL_NLSUPPORT_H
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/pipe.h b/include/osl/pipe.h
index 52ba8b9813e6..f5b1561c7341 100644
--- a/include/osl/pipe.h
+++ b/include/osl/pipe.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _OSL_PIPE_H_
-#define _OSL_PIPE_H_
+#ifndef INCLUDED_OSL_PIPE_H
+#define INCLUDED_OSL_PIPE_H
 
 #include "sal/config.h"
 
@@ -92,6 +92,6 @@ SAL_DLLPUBLIC oslPipeError SAL_CALL osl_getLastPipeError(oslPipe Pipe);
 }
 #endif
 
-#endif  /* _OSL_PIPE_H_ */
+#endif // INCLUDED_OSL_PIPE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/pipe.hxx b/include/osl/pipe.hxx
index 906ca8b08fb8..e1bb0d32b926 100644
--- a/include/osl/pipe.hxx
+++ b/include/osl/pipe.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _OSL_PIPE_HXX_
-#define _OSL_PIPE_HXX_
+#ifndef INCLUDED_OSL_PIPE_HXX
+#define INCLUDED_OSL_PIPE_HXX
 
 #include <osl/pipe_decl.hxx>
 
diff --git a/include/osl/pipe_decl.hxx b/include/osl/pipe_decl.hxx
index 21e07952b7ff..0fb8c4429cd4 100644
--- a/include/osl/pipe_decl.hxx
+++ b/include/osl/pipe_decl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _OSL_PIPE_DECL_HXX_
-#define _OSL_PIPE_DECL_HXX_
+#ifndef INCLUDED_OSL_PIPE_DECL_HXX
+#define INCLUDED_OSL_PIPE_DECL_HXX
 
 #include <osl/pipe.h>
 #   include <osl/security.hxx>
diff --git a/include/osl/process.h b/include/osl/process.h
index d575f3cf867c..300c5754655e 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _OSL_PROCESS_H_
-#define _OSL_PROCESS_H_
+#ifndef INCLUDED_OSL_PROCESS_H
+#define INCLUDED_OSL_PROCESS_H
 
 #include "sal/config.h"
 
@@ -446,6 +446,6 @@ SAL_DLLPUBLIC oslSocket SAL_CALL osl_receiveResourcePipe(
 }
 #endif
 
-#endif    /* _OSL_PROCESS_H_ */
+#endif // INCLUDED_OSL_PROCESS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/profile.h b/include/osl/profile.h
index fcbf898c5754..40ccc7dfeae1 100644
--- a/include/osl/profile.h
+++ b/include/osl/profile.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_PROFILE_H_
-#define _OSL_PROFILE_H_
+#ifndef INCLUDED_OSL_PROFILE_H
+#define INCLUDED_OSL_PROFILE_H
 
 #include "sal/config.h"
 
@@ -140,6 +140,6 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_getProfileSections(
 }
 #endif
 
-#endif  /* _OSL_PROFILE_H_ */
+#endif // INCLUDED_OSL_PROFILE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/profile.hxx b/include/osl/profile.hxx
index 9197067555cf..3d7452174f00 100644
--- a/include/osl/profile.hxx
+++ b/include/osl/profile.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_PROFILE_HXX_
-#define _OSL_PROFILE_HXX_
+#ifndef INCLUDED_OSL_PROFILE_HXX
+#define INCLUDED_OSL_PROFILE_HXX
 
 #include "profile.h"
 #include <rtl/ustring.hxx>
@@ -190,7 +190,7 @@ namespace osl {
     };
 }
 
-#endif  /* _OSL_PROFILE_HXX_ */
+#endif // INCLUDED_OSL_PROFILE_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/security.h b/include/osl/security.h
index b1376a2ed2a1..4fa780b5fedc 100644
--- a/include/osl/security.h
+++ b/include/osl/security.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SECURITY_H_
-#define _OSL_SECURITY_H_
+#ifndef INCLUDED_OSL_SECURITY_H
+#define INCLUDED_OSL_SECURITY_H
 
 #include "sal/config.h"
 
@@ -158,6 +158,6 @@ SAL_DLLPUBLIC void SAL_CALL osl_unloadUserProfile(
 }
 #endif
 
-#endif  /* _OSL_SECURITY_H_ */
+#endif // INCLUDED_OSL_SECURITY_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/security_decl.hxx b/include/osl/security_decl.hxx
index ba2f4195d769..5ea3cb17fdaf 100644
--- a/include/osl/security_decl.hxx
+++ b/include/osl/security_decl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SECURITY_DECL_HXX_
-#define _OSL_SECURITY_DECL_HXX_
+#ifndef INCLUDED_OSL_SECURITY_DECL_HXX
+#define INCLUDED_OSL_SECURITY_DECL_HXX
 
 #include <rtl/ustring.hxx>
 #   include <osl/security.h>
@@ -105,6 +105,6 @@ public:
 
 }
 
-#endif  // _OSL_SECURITY_HXX_
+#endif // INCLUDED_OSL_SECURITY_DECL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/signal.h b/include/osl/signal.h
index ca113308cf92..75af0329a622 100644
--- a/include/osl/signal.h
+++ b/include/osl/signal.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SIGNAL_H_
-#define _OSL_SIGNAL_H_
+#ifndef INCLUDED_OSL_SIGNAL_H
+#define INCLUDED_OSL_SIGNAL_H
 
 #include "sal/config.h"
 
@@ -106,7 +106,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_setErrorReporting(
 }
 #endif
 
-#endif  /* _OSL_SIGNAL_H_ */
+#endif // INCLUDED_OSL_SIGNAL_H
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/socket.h b/include/osl/socket.h
index 8ccb2c740f53..23161c303bd3 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SOCKET_H_
-#define _OSL_SOCKET_H_
+#ifndef INCLUDED_OSL_SOCKET_H
+#define INCLUDED_OSL_SOCKET_H
 
 #include <rtl/ustring.h>
 #include <rtl/byteseq.h>
@@ -915,6 +915,6 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_writeSocket( oslSocket Socket, const void *
 }
 #endif
 
-#endif  /* _OSL_SOCKET_H_ */
+#endif // INCLUDED_OSL_SOCKET_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx
index f8246c48a448..2537d9f970a6 100644
--- a/include/osl/socket.hxx
+++ b/include/osl/socket.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _OSL_SOCKET_HXX_
-#define _OSL_SOCKET_HXX_
+#ifndef INCLUDED_OSL_SOCKET_HXX
+#define INCLUDED_OSL_SOCKET_HXX
 
 #include <osl/socket_decl.hxx>
 
diff --git a/include/osl/socket_decl.hxx b/include/osl/socket_decl.hxx
index 2bcbd6cbd575..38c9d7694c7f 100644
--- a/include/osl/socket_decl.hxx
+++ b/include/osl/socket_decl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SOCKET_DECL_HXX_
-#define _OSL_SOCKET_DECL_HXX_
+#ifndef INCLUDED_OSL_SOCKET_DECL_HXX
+#define INCLUDED_OSL_SOCKET_DECL_HXX
 
 #include <osl/socket.h>
 #include <rtl/ustring.hxx>
diff --git a/include/osl/thread.h b/include/osl/thread.h
index bc93a57b1735..23a52e422c5c 100644
--- a/include/osl/thread.h
+++ b/include/osl/thread.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_THREAD_H_
-#define _OSL_THREAD_H_
+#ifndef INCLUDED_OSL_THREAD_H
+#define INCLUDED_OSL_THREAD_H
 
 #include "sal/config.h"
 
@@ -191,6 +191,6 @@ SAL_DLLPUBLIC rtl_TextEncoding SAL_CALL osl_setThreadTextEncoding(rtl_TextEncodi
 }
 #endif
 
-#endif  /* _OSL_THREAD_H_ */
+#endif // INCLUDED_OSL_THREAD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/osl/thread.hxx b/include/osl/thread.hxx
index 3a1b73e829ef..571ea1fc2663 100644
--- a/include/osl/thread.hxx
+++ b/include/osl/thread.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _THREAD_HXX_
-#define _THREAD_HXX_
+#ifndef INCLUDED_OSL_THREAD_HXX
+#define INCLUDED_OSL_THREAD_HXX
 
 #include "sal/config.h"
author	Thomas Arnhold <thomas@arnhold.org>	2013-10-23 19:17:28 +0200
committer	Thomas Arnhold <thomas@arnhold.org>	2013-10-23 23:22:30 +0200
commit	10d0526d7273df6b52a2f46b68fb0e63f9db0d92 (patch)
tree	2edf62b3c0f11dfce96f30433fa918c46e022f54 /include
parent	fixincludeguards.sh: include/c* (diff)
download	core-10d0526d7273df6b52a2f46b68fb0e63f9db0d92.tar.gz core-10d0526d7273df6b52a2f46b68fb0e63f9db0d92.zip