rename include guards to avoid use of __

Change-Id: I91bc5c8405165085e7c69ab8cf372bf7c785bf5b

38 files changed, 107 insertions, 107 deletions

diff --git a/inc/libmspub/MSPUBDocument.h b/inc/libmspub/MSPUBDocument.h
index be0cfbc..dad6e82 100644
--- a/inc/libmspub/MSPUBDocument.h
+++ b/inc/libmspub/MSPUBDocument.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MSPUBDOCUMENT_H__
-#define __MSPUBDOCUMENT_H__
+#ifndef INCLUDED_INC_LIBMSPUB_MSPUBDOCUMENT_H
+#define INCLUDED_INC_LIBMSPUB_MSPUBDOCUMENT_H
 
 #include <librevenge/librevenge.h>
 
@@ -39,5 +39,5 @@ public:
 
 } // namespace libmspub
 
-#endif //  __MSPUBDOCUMENT_H__
+#endif //  INCLUDED_INC_LIBMSPUB_MSPUBDOCUMENT_H
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libmspub/libmspub.h b/inc/libmspub/libmspub.h
index c637abf..70764f5 100644
--- a/inc/libmspub/libmspub.h
+++ b/inc/libmspub/libmspub.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __LIBMSPUB_H__
-#define __LIBMSPUB_H__
+#ifndef INCLUDED_INC_LIBMSPUB_LIBMSPUB_H
+#define INCLUDED_INC_LIBMSPUB_LIBMSPUB_H
 
 #include "MSPUBDocument.h"
 
diff --git a/src/lib/Arrow.h b/src/lib/Arrow.h
index 74dc9df..2403057 100644
--- a/src/lib/Arrow.h
+++ b/src/lib/Arrow.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __ARROW_H__
-#define __ARROW_H__
+#ifndef INCLUDED_ARROW_H
+#define INCLUDED_ARROW_H
 
 namespace libmspub
 {
@@ -39,5 +39,5 @@ struct Arrow
 };
 } // namespace libmspub
 
-#endif /* __ARROW_H__ */
+#endif /* INCLUDED_ARROW_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/BorderArtInfo.h b/src/lib/BorderArtInfo.h
index 71e91c0..f09a163 100644
--- a/src/lib/BorderArtInfo.h
+++ b/src/lib/BorderArtInfo.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __BORDERARTINFO_H__
-#define __BORDERARTINFO_H__
+#ifndef INCLUDED_BORDERARTINFO_H
+#define INCLUDED_BORDERARTINFO_H
 
 #include <vector>
 #include <librevenge/librevenge.h>
diff --git a/src/lib/ColorReference.h b/src/lib/ColorReference.h
index 842a0c4..2549366 100644
--- a/src/lib/ColorReference.h
+++ b/src/lib/ColorReference.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __COLORREFERENCE_H__
-#define __COLORREFERENCE_H__
+#ifndef INCLUDED_COLORREFERENCE_H
+#define INCLUDED_COLORREFERENCE_H
 
 #include "MSPUBTypes.h"
 
@@ -32,5 +32,5 @@ public:
 };
 }
 
-#endif /* __COLORREFERENCE_H__ */
+#endif /* INCLUDED_COLORREFERENCE_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/Coordinate.h b/src/lib/Coordinate.h
index 336eb09..ac790ec 100644
--- a/src/lib/Coordinate.h
+++ b/src/lib/Coordinate.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __COORDINATE_H__
-#define __COORDINATE_H__
+#ifndef INCLUDED_COORDINATE_H
+#define INCLUDED_COORDINATE_H
 #include "MSPUBConstants.h"
 namespace libmspub
 {
diff --git a/src/lib/Dash.h b/src/lib/Dash.h
index e9c85a6..d48e68a 100644
--- a/src/lib/Dash.h
+++ b/src/lib/Dash.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __DASH_H__
-#define __DASH_H__
+#ifndef INCLUDED_DASH_H
+#define INCLUDED_DASH_H
 
 #include <boost/optional.hpp>
 #include <vector>
@@ -62,5 +62,5 @@ Dash getDash(MSPUBDashStyle style, unsigned shapeLineWidthInEmu,
              DotStyle dotStyle);
 } // namespace libmspub
 
-#endif /* __DASH_H__ */
+#endif /* INCLUDED_DASH_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/EmbeddedFontInfo.h b/src/lib/EmbeddedFontInfo.h
index 1200e81..5006b64 100644
--- a/src/lib/EmbeddedFontInfo.h
+++ b/src/lib/EmbeddedFontInfo.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __EMBEDDEDFONTINFO_H__
-#define __EMBEDDEDFONTINFO_H__
+#ifndef INCLUDED_EMBEDDEDFONTINFO_H
+#define INCLUDED_EMBEDDEDFONTINFO_H
 
 #include <librevenge/librevenge.h>
 
@@ -25,5 +25,5 @@ struct EmbeddedFontInfo
 };
 } // namespace libmspub
 
-#endif /* __EMBEDDEDFONTINFO_H__ */
+#endif /* INCLUDED_EMBEDDEDFONTINFO_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/EscherContainerType.h b/src/lib/EscherContainerType.h
index 2ba0ad3..d019f17 100644
--- a/src/lib/EscherContainerType.h
+++ b/src/lib/EscherContainerType.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __ESCHERCONTAINERTYPE_H__
-#define __ESCHERCONTAINERTYPE_H__
+#ifndef INCLUDED_ESCHERCONTAINERTYPE_H
+#define INCLUDED_ESCHERCONTAINERTYPE_H
 
 #define OFFICE_ART_DGG_CONTAINER      0xF000
 #define OFFICE_ART_B_STORE_CONTAINER  0xF001
@@ -31,5 +31,5 @@
 #define OFFICE_ART_FSPGR              0xF009
 #define OFFICE_ART_CHILD_ANCHOR       0xF00F
 
-#endif /* __ESCHERCONTAINERTYPE_H__ */
+#endif /* INCLUDED_ESCHERCONTAINERTYPE_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/EscherFieldIds.h b/src/lib/EscherFieldIds.h
index 1065d48..6245ea4 100644
--- a/src/lib/EscherFieldIds.h
+++ b/src/lib/EscherFieldIds.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __ESCHERFIELDIDS_H__
-#define __ESCHERFIELDIDS_H__
+#ifndef INCLUDED_ESCHERFIELDIDS_H
+#define INCLUDED_ESCHERFIELDIDS_H
 
 #define FIELDID_XS                     0x2001
 #define FIELDID_YS                     0x2002
@@ -100,5 +100,5 @@
 #define FLAG_USE_FSHADOW   (1 << 17)
 #define FLAG_USE_SHADOW   (1 << 1)
 
-#endif /* __ESCHERFIELDIDS_H__ */
+#endif /* INCLUDED_ESCHERFIELDIDS_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/Fill.h b/src/lib/Fill.h
index 1d08467..c9c8b78 100644
--- a/src/lib/Fill.h
+++ b/src/lib/Fill.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __FILL_H__
-#define __FILL_H__
+#ifndef INCLUDED_FILL_H
+#define INCLUDED_FILL_H
 
 #include <cstddef>
 
@@ -103,5 +103,5 @@ private:
 };
 }
 
-#endif /* __FILL_H__ */
+#endif /* INCLUDED_FILL_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/FillType.h b/src/lib/FillType.h
index 4d77217..11e9039 100644
--- a/src/lib/FillType.h
+++ b/src/lib/FillType.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __FILLTYPE_H__
-#define __FILLTYPE_H__
+#ifndef INCLUDED_FILLTYPE_H
+#define INCLUDED_FILLTYPE_H
 
 namespace libmspub
 {
@@ -29,5 +29,5 @@ enum FillType
   BACKGROUND = 0x09
 };
 } // libmspub
-#endif /* __FILLTYPE_H__ */
+#endif /* INCLUDED_FILLTYPE_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/Line.h b/src/lib/Line.h
index 7df675a..d528d38 100644
--- a/src/lib/Line.h
+++ b/src/lib/Line.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __LINE_H__
-#define __LINE_H__
+#ifndef INCLUDED_LINE_H
+#define INCLUDED_LINE_H
 #include "Dash.h"
 #include <boost/optional.hpp>
 #include "ColorReference.h"
diff --git a/src/lib/ListInfo.h b/src/lib/ListInfo.h
index 1efa8a3..b6f839f 100644
--- a/src/lib/ListInfo.h
+++ b/src/lib/ListInfo.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __LISTINFO_H__
-#define __LISTINFO_H__
+#ifndef INCLUDED_LISTINFO_H
+#define INCLUDED_LISTINFO_H
 
 #include <boost/optional.hpp>
 
@@ -48,5 +48,5 @@ struct ListInfo
 };
 } // namespace libmspub
 
-#endif /* __LISTINFO_H__ */
+#endif /* INCLUDED_LISTINFO_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/MSPUBBlockID.h b/src/lib/MSPUBBlockID.h
index a4cafa4..4420e05 100644
--- a/src/lib/MSPUBBlockID.h
+++ b/src/lib/MSPUBBlockID.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MSPUBBLOCKID_H__
-#define __MSPUBBLOCKID_H__
+#ifndef INCLUDED_MSPUBBLOCKID_H
+#define INCLUDED_MSPUBBLOCKID_H
 
 namespace libmspub
 {
@@ -84,5 +84,5 @@ enum MSPUBBlockID // Don't be alarmed by multiple elements with the same value;
 };
 } // namespace libmspub
 
-#endif /* __MSPUBBLOCKID_H__ */
+#endif /* INCLUDED_MSPUBBLOCKID_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/MSPUBBlockType.h b/src/lib/MSPUBBlockType.h
index 7f43327..bc230d7 100644
--- a/src/lib/MSPUBBlockType.h
+++ b/src/lib/MSPUBBlockType.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MSPUBBLOCKTYPE_H__
-#define __MSPUBBLOCKTYPE_H__
+#ifndef INCLUDED_MSPUBBLOCKTYPE_H
+#define INCLUDED_MSPUBBLOCKTYPE_H
 
 namespace libmspub
 {
@@ -22,5 +22,5 @@ enum MSPUBBlockType //Please fill this in and replace magic constants in MSPUBPa
 };
 } // namespace libmspub
 
-#endif /* __MSPUBBLOCKTYPE_H__ */
+#endif /* INCLUDED_MSPUBBLOCKTYPE_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/MSPUBCollector.h b/src/lib/MSPUBCollector.h
index 728d1df..61bfbdb 100644
--- a/src/lib/MSPUBCollector.h
+++ b/src/lib/MSPUBCollector.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MSPUBCOLLECTOR_H__
-#define __MSPUBCOLLECTOR_H__
+#ifndef INCLUDED_MSPUBCOLLECTOR_H
+#define INCLUDED_MSPUBCOLLECTOR_H
 
 #include <functional>
 #include <list>
@@ -203,5 +203,5 @@ public:
 };
 } // namespace libmspub
 
-#endif /* __MSPUBCOLLECTOR_H__ */
+#endif /* INCLUDED_MSPUBCOLLECTOR_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/MSPUBConstants.h b/src/lib/MSPUBConstants.h
index 2acc5cb..c4712b2 100644
--- a/src/lib/MSPUBConstants.h
+++ b/src/lib/MSPUBConstants.h
@@ -7,12 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MSPUBCONSTANTS_H__
-#define __MSPUBCONSTANTS_H__
+#ifndef INCLUDED_MSPUBCONSTANTS_H
+#define INCLUDED_MSPUBCONSTANTS_H
 
 #define EMUS_IN_INCH 914400
 #define POINTS_IN_INCH 72
 #define DEFAULT_MARGIN 36576
 
-#endif /* __MSPUBCONSTANTS_H__ */
+#endif /* INCLUDED_MSPUBCONSTANTS_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/MSPUBContentChunkType.h b/src/lib/MSPUBContentChunkType.h
index 404c1c0..ab86e1c 100644
--- a/src/lib/MSPUBContentChunkType.h
+++ b/src/lib/MSPUBContentChunkType.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MSPUBCHUNKTYPE_H__
-#define __MSPUBCHUNKTYPE_H__
+#ifndef INCLUDED_MSPUBCHUNKTYPE_H
+#define INCLUDED_MSPUBCHUNKTYPE_H
 
 namespace libmspub
 {
@@ -31,5 +31,5 @@ enum MSPUBContentChunkType //Please fill this in and replace magic constants in
 };
 } // namespace libmspub
 
-#endif /* __MSPUBCHUNKTYPE_H__ */
+#endif /* INCLUDED_MSPUBCHUNKTYPE_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/MSPUBMetaData.h b/src/lib/MSPUBMetaData.h
index f0f994c..f8136a1 100644
--- a/src/lib/MSPUBMetaData.h
+++ b/src/lib/MSPUBMetaData.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MSPUBMETADATA_H__
-#define __MSPUBMETADATA_H__
+#ifndef INCLUDED_MSPUBMETADATA_H
+#define INCLUDED_MSPUBMETADATA_H
 
 #include <vector>
 #include <utility>
@@ -48,6 +48,6 @@ private:
 
 } // namespace libmspub
 
-#endif // __MSPUBMETADATA_H__
+#endif // INCLUDED_MSPUBMETADATA_H
 
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/MSPUBParser.h b/src/lib/MSPUBParser.h
index af30928..9426536 100644
--- a/src/lib/MSPUBParser.h
+++ b/src/lib/MSPUBParser.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MSPUBPARSER_H__
-#define __MSPUBPARSER_H__
+#ifndef INCLUDED_MSPUBPARSER_H
+#define INCLUDED_MSPUBPARSER_H
 
 #include <map>
 #include <memory>
@@ -174,5 +174,5 @@ protected:
 
 } // namespace libmspub
 
-#endif //  __MSPUBRAPHICS_H__
+#endif //  INCLUDED_MSPUBRAPHICS_H
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/MSPUBParser2k.h b/src/lib/MSPUBParser2k.h
index 89ce22f..28e9686 100644
--- a/src/lib/MSPUBParser2k.h
+++ b/src/lib/MSPUBParser2k.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MSPUBPARSER2K_H__
-#define __MSPUBPARSER2K_H__
+#ifndef INCLUDED_MSPUBPARSER2K_H
+#define INCLUDED_MSPUBPARSER2K_H
 
 #include <deque>
 #include <vector>
@@ -69,6 +69,6 @@ public:
 
 } // namespace libmspub
 
-#endif //  __MSPUBPARSER2K_H__
+#endif //  INCLUDED_MSPUBPARSER2K_H
 
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/MSPUBParser97.h b/src/lib/MSPUBParser97.h
index ec3d014..018e3fa 100644
--- a/src/lib/MSPUBParser97.h
+++ b/src/lib/MSPUBParser97.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MSPUBPARSER97_H__
-#define __MSPUBPARSER97_H__
+#ifndef INCLUDED_MSPUBPARSER97_H
+#define INCLUDED_MSPUBPARSER97_H
 
 #include "MSPUBParser2k.h"
 
@@ -63,6 +63,6 @@ public:
 };
 }
 
-#endif //  __MSPUBPARSER97_H__
+#endif //  INCLUDED_MSPUBPARSER97_H
 
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/MSPUBTypes.h b/src/lib/MSPUBTypes.h
index f3257e1..7fae7e9 100644
--- a/src/lib/MSPUBTypes.h
+++ b/src/lib/MSPUBTypes.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MSPUBTYPES_H__
-#define __MSPUBTYPES_H__
+#ifndef INCLUDED_MSPUBTYPES_H
+#define INCLUDED_MSPUBTYPES_H
 
 #include <vector>
 #include <string>
@@ -191,5 +191,5 @@ enum ImgType
 
 } // namespace libmspub
 
-#endif /* __MSPUBTYPES_H__ */
+#endif /* INCLUDED_MSPUBTYPES_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/Margins.h b/src/lib/Margins.h
index 02bf92a..4056c0d 100644
--- a/src/lib/Margins.h
+++ b/src/lib/Margins.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __MARGINS_H__
-#define __MARGINS_H__
+#ifndef INCLUDED_MARGINS_H
+#define INCLUDED_MARGINS_H
 namespace libmspub
 {
 struct Margins
diff --git a/src/lib/NumberingDelimiter.h b/src/lib/NumberingDelimiter.h
index fcec6fb..e5663ac 100644
--- a/src/lib/NumberingDelimiter.h
+++ b/src/lib/NumberingDelimiter.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __NUMBERINGDELIMITER_H__
-#define __NUMBERINGDELIMITER_H__
+#ifndef INCLUDED_NUMBERINGDELIMITER_H
+#define INCLUDED_NUMBERINGDELIMITER_H
 
 namespace libmspub
 {
@@ -26,5 +26,5 @@ enum NumberingDelimiter
 };
 } // namespace libmspub
 
-#endif /* __NUMBERINGDELIMITER_H__ */
+#endif /* INCLUDED_NUMBERINGDELIMITER_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/NumberingType.h b/src/lib/NumberingType.h
index 2f45ed4..0f65e0a 100644
--- a/src/lib/NumberingType.h
+++ b/src/lib/NumberingType.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __NUMBERINGTYPE_H__
-#define __NUMBERINGTYPE_H__
+#ifndef INCLUDED_NUMBERINGTYPE_H
+#define INCLUDED_NUMBERINGTYPE_H
 
 namespace libmspub
 {
@@ -26,5 +26,5 @@ enum NumberingType
 };
 } // namespace libmspub
 
-#endif /* __NUMBERINGTYPE_H__ */
+#endif /* INCLUDED_NUMBERINGTYPE_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/PolygonUtils.h b/src/lib/PolygonUtils.h
index 9750668..37d9b7b 100644
--- a/src/lib/PolygonUtils.h
+++ b/src/lib/PolygonUtils.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __POLYGONUTILS_H__
-#define __POLYGONUTILS_H__
+#ifndef INCLUDED_POLYGONUTILS_H
+#define INCLUDED_POLYGONUTILS_H
 
 #include <functional>
 #include <memory>
@@ -118,5 +118,5 @@ librevenge::RVNGPropertyList calcClipPath(const std::vector<libmspub::Vertex> &v
 void writeCustomShape(ShapeType shapeType, librevenge::RVNGPropertyList &graphicsProps, librevenge::RVNGDrawingInterface *painter, double x, double y, double height, double width, bool closeEverything, VectorTransformation2D transform, std::vector<Line> lines, std::function<double(unsigned index)> calculator, const std::vector<Color> &palette, std::shared_ptr<const CustomShape> shape);
 
 } // libmspub
-#endif /* __POLYGONUTILS_H__ */
+#endif /* INCLUDED_POLYGONUTILS_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/Shadow.h b/src/lib/Shadow.h
index 4e06c46..8cd9764 100644
--- a/src/lib/Shadow.h
+++ b/src/lib/Shadow.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SHADOW_H__
-#define __SHADOW_H__
+#ifndef INCLUDED_SHADOW_H
+#define INCLUDED_SHADOW_H
 
 #include "ColorReference.h"
 
@@ -48,5 +48,5 @@ struct Shadow
 bool needsEmulation(const Shadow &shadow);
 } // namespace libmspub
 
-#endif /* __SHADOW_H__ */
+#endif /* INCLUDED_SHADOW_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/ShapeFlags.h b/src/lib/ShapeFlags.h
index 66ad36f..05fd3b2 100644
--- a/src/lib/ShapeFlags.h
+++ b/src/lib/ShapeFlags.h
@@ -26,8 +26,8 @@
  * instead of those above.
  */
 
-#ifndef __SHAPEFLAGS_H__
-#define __SHAPEFLAGS_H__
+#ifndef INCLUDED_SHAPEFLAGS_H
+#define INCLUDED_SHAPEFLAGS_H
 
 #define SF_GROUP       (1 << 0)
 #define SF_CHILD       (1 << 1)
@@ -42,5 +42,5 @@
 #define SF_BACKGROUND  (1 << 10)
 #define SF_HAVE_SPT    (1 << 11)
 
-#endif /* __SHAPEFLAGS_H__ */
+#endif /* INCLUDED_SHAPEFLAGS_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/ShapeGroupElement.h b/src/lib/ShapeGroupElement.h
index 1be6ed5..c95b6cc 100644
--- a/src/lib/ShapeGroupElement.h
+++ b/src/lib/ShapeGroupElement.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SHAPEGROUPELEMENT_H__
-#define __SHAPEGROUPELEMENT_H__
+#ifndef INCLUDED_SHAPEGROUPELEMENT_H
+#define INCLUDED_SHAPEGROUPELEMENT_H
 #include <boost/optional.hpp>
 #include <functional>
 #include <memory>
diff --git a/src/lib/ShapeInfo.h b/src/lib/ShapeInfo.h
index eee7974..ec8050f 100644
--- a/src/lib/ShapeInfo.h
+++ b/src/lib/ShapeInfo.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SHAPEINFO_H__
-#define __SHAPEINFO_H__
+#ifndef INCLUDED_SHAPEINFO_H
+#define INCLUDED_SHAPEINFO_H
 #include <boost/optional.hpp>
 #include <functional>
 #include <map>
diff --git a/src/lib/ShapeType.h b/src/lib/ShapeType.h
index 2506f97..dc78c08 100644
--- a/src/lib/ShapeType.h
+++ b/src/lib/ShapeType.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SHAPETYPE_H__
-#define __SHAPETYPE_H__
+#ifndef INCLUDED_SHAPETYPE_H
+#define INCLUDED_SHAPETYPE_H
 
 namespace libmspub
 {
@@ -182,5 +182,5 @@ enum ShapeType
   TEXT_BOX            = 202
 };
 } // libmspub
-#endif /* __SHAPETYPE_H__ */
+#endif /* INCLUDED_SHAPETYPE_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/Shapes.h b/src/lib/Shapes.h
index 0ed08ab..1fed488 100644
--- a/src/lib/Shapes.h
+++ b/src/lib/Shapes.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SHAPES_H__
-#define __SHAPES_H__
+#ifndef INCLUDED_SHAPES_H
+#define INCLUDED_SHAPES_H
 
 #include <vector>
 #include <map>
@@ -114,5 +114,5 @@ public:
   VectorTransformation2D m_foldedTransform;
 };
 } // namespace libmspub
-#endif // __SHAPES_H__
+#endif // INCLUDED_SHAPES_H
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/TableInfo.h b/src/lib/TableInfo.h
index d661d16..7ff4240 100644
--- a/src/lib/TableInfo.h
+++ b/src/lib/TableInfo.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __TABLEINFO_H__
-#define __TABLEINFO_H__
+#ifndef INCLUDED_TABLEINFO_H
+#define INCLUDED_TABLEINFO_H
 
 #include <vector>
 
@@ -46,5 +46,5 @@ struct TableInfo
 };
 } // namespace libmspub
 
-#endif /* __TABLEINFO_H__ */
+#endif /* INCLUDED_TABLEINFO_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/VectorTransformation2D.h b/src/lib/VectorTransformation2D.h
index 34db4b8..eba2770 100644
--- a/src/lib/VectorTransformation2D.h
+++ b/src/lib/VectorTransformation2D.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __VECTORTRANSFORMATION2D_H__
-#define __VECTORTRANSFORMATION2D_H__
+#ifndef INCLUDED_VECTORTRANSFORMATION2D_H
+#define INCLUDED_VECTORTRANSFORMATION2D_H
 
 namespace libmspub
 {
@@ -42,5 +42,5 @@ public:
 VectorTransformation2D operator*(const VectorTransformation2D &l, const VectorTransformation2D &r);
 } // namespace libmspub
 
-#endif /* __VECTORTRANSFORMATION2D_H__ */
+#endif /* INCLUDED_VECTORTRANSFORMATION2D_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/VerticalAlign.h b/src/lib/VerticalAlign.h
index d25f816..b4c7496 100644
--- a/src/lib/VerticalAlign.h
+++ b/src/lib/VerticalAlign.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __VERTICALALIGN_H__
-#define __VERTICALALIGN_H__
+#ifndef INCLUDED_VERTICALALIGN_H
+#define INCLUDED_VERTICALALIGN_H
 
 namespace libmspub
 {
@@ -20,5 +20,5 @@ enum VerticalAlign
 };
 } // namespace libmspub
 
-#endif /* __VERTICALALIGN_H__ */
+#endif /* INCLUDED_VERTICALALIGN_H */
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/libmspub_utils.h b/src/lib/libmspub_utils.h
index 8b30c9f..c06d285 100644
--- a/src/lib/libmspub_utils.h
+++ b/src/lib/libmspub_utils.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __LIBMSPUB_UTILS_H__
-#define __LIBMSPUB_UTILS_H__
+#ifndef INCLUDED_LIBMSPUB_UTILS_H
+#define INCLUDED_LIBMSPUB_UTILS_H
 
 #include <stdio.h>
 #include <vector>
@@ -127,5 +127,5 @@ librevenge::RVNGBinaryData inflateData(librevenge::RVNGBinaryData);
 
 } // namespace libmspub
 
-#endif // __LIBMSPUB_UTILS_H__
+#endif // INCLUDED_LIBMSPUB_UTILS_H
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */