4 files changed, 9 insertions, 11 deletions
diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx
index e3ea631af274..01b994b8b760 100644
--- a/oox/source/shape/LockedCanvasContext.hxx
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OOX_SHAPE_LOCKEDCANVASCONTEXT
-#define OOX_SHAPE_LOCKEDCANVASCONTEXT
+#ifndef INCLUDED_OOX_SOURCE_SHAPE_LOCKEDCANVASCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_SHAPE_LOCKEDCANVASCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/shape.hxx"
@@ -34,7 +34,6 @@ protected:
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index a1e8e0297055..d7a49a128d4e 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.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 OOX_SHAPE_SHAPE_CONTEXT_HANDLER_HXX
-#define OOX_SHAPE_SHAPE_CONTEXT_HANDLER_HXX
+#ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
+#define INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -168,6 +168,6 @@ private:
 
 }}
 
-#endif // OOX_SHAPE_SHAPE_CONTEXT_HANDLER_HXX
+#endif // INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index 09612dd1bea7..82478b724d99 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OOX_SHAPE_DRAWINGFRAGMENTHANDLER
-#define OOX_SHAPE_DRAWINGFRAGMENTHANDLER
+#ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPEDRAWINGFRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_SOURCE_SHAPE_SHAPEDRAWINGFRAGMENTHANDLER_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/drawingml/shapegroupcontext.hxx"
@@ -31,7 +31,6 @@ private:
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx
index abdece1c4600..330eee1d4f4a 100644
--- a/oox/source/shape/ShapeFilterBase.hxx
+++ b/oox/source/shape/ShapeFilterBase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_SHAPE_SHAPEFILTERBASE_HXX
-#define OOX_SHAPE_SHAPEFILTERBASE_HXX
+#ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPEFILTERBASE_HXX
+#define INCLUDED_OOX_SOURCE_SHAPE_SHAPEFILTERBASE_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <rtl/ref.hxx>