fixincludeguards.sh: idl and idlc

Change-Id: I665e901eb6f65308b8f130da1c6da95bc3255490

43 files changed, 123 insertions, 123 deletions

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index d09ef13d0abd..a3fce244a4c6 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BASOBJ_HXX
-#define _BASOBJ_HXX
+#ifndef INCLUDED_IDL_INC_BASOBJ_HXX
+#define INCLUDED_IDL_INC_BASOBJ_HXX
 
 #include <tools/ref.hxx>
 #include <bastype.hxx>
@@ -228,7 +228,7 @@ typedef tools::SvRef<SvMetaExtern> SvMetaExternRef;
 
 class SvMetaExternMemberList : public SvDeclPersistList<SvMetaExtern *> {};
 
-#endif // _BASOBJ_HXX
+#endif // INCLUDED_IDL_INC_BASOBJ_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 94d6d4054710..0bd86515aac8 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BASTYPE_HXX
-#define _BASTYPE_HXX
+#ifndef INCLUDED_IDL_INC_BASTYPE_HXX
+#define INCLUDED_IDL_INC_BASTYPE_HXX
 
 
 #include <sal/types.h>
@@ -222,6 +222,6 @@ public:
 };
 
 
-#endif // _BASTYPE_HXX
+#endif // INCLUDED_IDL_INC_BASTYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 3ee2bcb9cd74..bbf730d8cef6 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMMAND_HXX
-#define _COMMAND_HXX
+#ifndef INCLUDED_IDL_INC_COMMAND_HXX
+#define INCLUDED_IDL_INC_COMMAND_HXX
 
 #include <rtl/ustring.hxx>
 #include <vector>
@@ -53,6 +53,6 @@ class SvIdlWorkingBase;
 sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
 void DeInit();
 
-#endif // _COMMAND_HXX
+#endif // INCLUDED_IDL_INC_COMMAND_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index f9abfd226f4b..52fc9ef42205 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DATABASE_HXX
-#define _DATABASE_HXX
+#ifndef INCLUDED_IDL_INC_DATABASE_HXX
+#define INCLUDED_IDL_INC_DATABASE_HXX
 
 #include <module.hxx>
 #include <hash.hxx>
@@ -162,6 +162,6 @@ public:
     sal_Bool        WriteDocumentation( SvStream& );
 };
 
-#endif // _DATABASE_HXX
+#endif // INCLUDED_IDL_INC_DATABASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index eb1c989b0822..7143f2a605e5 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _GLOBALS_HXX
-#define _GLOBALS_HXX
+#ifndef INCLUDED_IDL_INC_GLOBALS_HXX
+#define INCLUDED_IDL_INC_GLOBALS_HXX
 
 #include <hash.hxx>
 
@@ -224,6 +224,6 @@ HASH_INLINE(Description)
 HASH_INLINE(UnoName)
 
 
-#endif // _GLOBALS_HXX
+#endif // INCLUDED_IDL_INC_GLOBALS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 267b514b84ff..71e95609f76d 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HASH_HXX
-#define _HASH_HXX
+#ifndef INCLUDED_IDL_INC_HASH_HXX
+#define INCLUDED_IDL_INC_HASH_HXX
 
 #include <rtl/ustring.hxx>
 #include <tools/ref.hxx>
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 558d47c2dd1b..03900e14e314 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _LEX_HXX
-#define _LEX_HXX
+#ifndef INCLUDED_IDL_INC_LEX_HXX
+#define INCLUDED_IDL_INC_LEX_HXX
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
@@ -262,6 +262,6 @@ public:
 
 
 
-#endif // _LEX_HXX
+#endif // INCLUDED_IDL_INC_LEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index ff76450609ee..ce3ab0288a6a 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MODULE_HXX
-#define _MODULE_HXX
+#ifndef INCLUDED_IDL_INC_MODULE_HXX
+#define INCLUDED_IDL_INC_MODULE_HXX
 
 #include <slot.hxx>
 #include <object.hxx>
@@ -94,6 +94,6 @@ typedef tools::SvRef<SvMetaModule> SvMetaModuleRef;
 class SvMetaModuleMemberList : public SvDeclPersistList<SvMetaModule *> {};
 
 
-#endif // _MODULE_HXX
+#endif // INCLUDED_IDL_INC_MODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 7f26446077e4..01b51e204cdf 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OBJECT_HXX
-#define _OBJECT_HXX
+#ifndef INCLUDED_IDL_INC_OBJECT_HXX
+#define INCLUDED_IDL_INC_OBJECT_HXX
 
 #include <types.hxx>
 #include <slot.hxx>
@@ -135,6 +135,6 @@ public:
                                 HelpIdTable& rTable );
 };
 
-#endif // _OBJECT_HXX
+#endif // INCLUDED_IDL_INC_OBJECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 48a85c00c325..787c4d30ea39 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SLOT_HXX
-#define _SLOT_HXX
+#ifndef INCLUDED_IDL_INC_SLOT_HXX
+#define INCLUDED_IDL_INC_SLOT_HXX
 
 #include <types.hxx>
 #include <command.hxx>
@@ -257,6 +257,6 @@ typedef tools::SvRef<SvMetaSlot> SvMetaSlotRef;
 
 class SvMetaSlotMemberList : public SvDeclPersistList<SvMetaSlot *> {};
 
-#endif // _SLOT_HXX
+#endif // INCLUDED_IDL_INC_SLOT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index ee0d363739a2..077b8768980b 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TYPES_HXX
-#define _TYPES_HXX
+#ifndef INCLUDED_IDL_INC_TYPES_HXX
+#define INCLUDED_IDL_INC_TYPES_HXX
 
 #include <rtl/strbuf.hxx>
 #include <tools/ref.hxx>
@@ -306,6 +306,6 @@ typedef tools::SvRef<SvMetaTypevoid> SvMetaTypevoidRef;
 class SvMetaTypevoidMemberList : public SvDeclPersistList<SvMetaTypevoid *> {};
 
 
-#endif // _TYPES_HXX
+#endif // INCLUDED_IDL_INC_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx
index a5b4dd620848..013ac6653d3c 100644
--- a/idlc/inc/idlc/astattribute.hxx
+++ b/idlc/inc/idlc/astattribute.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 _IDLC_ASTATTRIBUTE_HXX_
-#define _IDLC_ASTATTRIBUTE_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTATTRIBUTE_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTATTRIBUTE_HXX
 
 #include <idlc/astdeclaration.hxx>
 #include "idlc/astscope.hxx"
@@ -109,6 +109,6 @@ private:
     DeclList m_setExceptions;
 };
 
-#endif // _IDLC_ASTATTRIBUTE_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTATTRIBUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astbasetype.hxx b/idlc/inc/idlc/astbasetype.hxx
index 08b21a358b5b..f2603a72bf91 100644
--- a/idlc/inc/idlc/astbasetype.hxx
+++ b/idlc/inc/idlc/astbasetype.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 _IDLC_ASTBASETYPE_HXX_
-#define _IDLC_ASTBASETYPE_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTBASETYPE_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTBASETYPE_HXX
 
 #include <idlc/asttype.hxx>
 #include <idlc/astexpression.hxx>
@@ -50,6 +50,6 @@ private:
     const ExprType m_exprType;
 };
 
-#endif // _IDLC_ASTBASETYPE_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTBASETYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astconstant.hxx b/idlc/inc/idlc/astconstant.hxx
index 57a43b62d981..cfad728f6aaf 100644
--- a/idlc/inc/idlc/astconstant.hxx
+++ b/idlc/inc/idlc/astconstant.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 _IDLC_ASTCONSTANT_HXX_
-#define _IDLC_ASTCONSTANT_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTCONSTANT_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTCONSTANT_HXX
 
 #include <idlc/astdeclaration.hxx>
 #include <idlc/astexpression.hxx>
@@ -45,6 +45,6 @@ private:
     const ExprType  m_constValueType;
 };
 
-#endif // _IDLC_ASTCONSTANT_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTCONSTANT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astconstants.hxx b/idlc/inc/idlc/astconstants.hxx
index e0f536da9d9c..65b2da863dca 100644
--- a/idlc/inc/idlc/astconstants.hxx
+++ b/idlc/inc/idlc/astconstants.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 _IDLC_ASTCONSTANTS_HXX_
-#define _IDLC_ASTCONSTANTS_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTCONSTANTS_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTCONSTANTS_HXX
 
 #include <idlc/astmodule.hxx>
 
@@ -30,6 +30,6 @@ public:
     virtual ~AstConstants() {}
 };
 
-#endif // _IDLC_ASTCONSTANTS_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTCONSTANTS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx
index 0906a5bd7b22..caa35d6a1598 100644
--- a/idlc/inc/idlc/astdeclaration.hxx
+++ b/idlc/inc/idlc/astdeclaration.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 _IDLC_ASTDECLARATION_HXX_
-#define _IDLC_ASTDECLARATION_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTDECLARATION_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTDECLARATION_HXX
 
 #include <idlc/idlc.hxx>
 #include <registry/registry.hxx>
@@ -132,6 +132,6 @@ protected:
     OUString     m_documentation;    // fileName defined in
 };
 
-#endif // _IDLC_ASTDECLARATION_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTDECLARATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astenum.hxx b/idlc/inc/idlc/astenum.hxx
index 716c2b57a096..98c386fc8ae4 100644
--- a/idlc/inc/idlc/astenum.hxx
+++ b/idlc/inc/idlc/astenum.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 _IDLC_ASTENUM_HXX_
-#define _IDLC_ASTENUM_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTENUM_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTENUM_HXX
 
 #include <idlc/asttype.hxx>
 #include <idlc/astscope.hxx>
@@ -45,6 +45,6 @@ private:
     sal_Int32   m_enumValueCount;
 };
 
-#endif // _IDLC_ASTENUM_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTENUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astexception.hxx b/idlc/inc/idlc/astexception.hxx
index d51dca1a13d3..efa9805d868f 100644
--- a/idlc/inc/idlc/astexception.hxx
+++ b/idlc/inc/idlc/astexception.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 _IDLC_ASTEXCEPTION_HXX_
-#define _IDLC_ASTEXCEPTION_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTEXCEPTION_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTEXCEPTION_HXX
 
 #include <idlc/aststruct.hxx>
 
@@ -31,6 +31,6 @@ public:
     virtual ~AstException() {}
 };
 
-#endif // _IDLC_ASTEXCEPTION_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTEXCEPTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx
index 242d0e80c268..79d63dd7027a 100644
--- a/idlc/inc/idlc/astexpression.hxx
+++ b/idlc/inc/idlc/astexpression.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 _IDLC_ASTEXPRESSION_HXX_
-#define _IDLC_ASTEXPRESSION_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTEXPRESSION_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTEXPRESSION_HXX
 
 #include <idlc/idlc.hxx>
 
@@ -174,6 +174,6 @@ private:
     OString* m_pSymbolicName;
 };
 
-#endif // _IDLC_ASTEXPRESSION_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTEXPRESSION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/idlc/astinterface.hxx
index b2297296e08b..e7a40ba3c456 100644
--- a/idlc/inc/idlc/astinterface.hxx
+++ b/idlc/inc/idlc/astinterface.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 _IDLC_ASTINTERFACE_HXX_
-#define _IDLC_ASTINTERFACE_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTINTERFACE_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTINTERFACE_HXX
 
 #include <idlc/asttype.hxx>
 #include <idlc/astscope.hxx>
@@ -132,6 +132,6 @@ private:
     VisibleMembers m_visibleMembers;
 };
 
-#endif // _IDLC_ASTINTERFACE_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTINTERFACE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astinterfacemember.hxx b/idlc/inc/idlc/astinterfacemember.hxx
index 5047a2432cfe..faaba11b939d 100644
--- a/idlc/inc/idlc/astinterfacemember.hxx
+++ b/idlc/inc/idlc/astinterfacemember.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 _IDLC_ASTINTERFACEMEMBER_HXX_
-#define _IDLC_ASTINTERFACEMEMBER_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTINTERFACEMEMBER_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTINTERFACEMEMBER_HXX
 
 #include <idlc/astinterface.hxx>
 
@@ -41,6 +41,6 @@ private:
     AstInterface*       m_pRealInterface;
 };
 
-#endif // _IDLC_ASTINTERFACEMEMBER_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTINTERFACEMEMBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astmember.hxx b/idlc/inc/idlc/astmember.hxx
index b2c2b7d2df4a..52a5042e0226 100644
--- a/idlc/inc/idlc/astmember.hxx
+++ b/idlc/inc/idlc/astmember.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _IDLC_ASTMEMBER_HXX_
-#define _IDLC_ASTMEMBER_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTMEMBER_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTMEMBER_HXX
 
 #include "idlc/astdeclaration.hxx"
 
diff --git a/idlc/inc/idlc/astmodule.hxx b/idlc/inc/idlc/astmodule.hxx
index edaa6f300c1c..42faf29f3ce5 100644
--- a/idlc/inc/idlc/astmodule.hxx
+++ b/idlc/inc/idlc/astmodule.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 _IDLC_ASTMODULE_HXX_
-#define _IDLC_ASTMODULE_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTMODULE_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTMODULE_HXX
 
 #include <idlc/astdeclaration.hxx>
 #include <idlc/astscope.hxx>
@@ -39,6 +39,6 @@ public:
     virtual bool dump(RegistryKey& rKey) SAL_OVERRIDE;
 };
 
-#endif // _IDLC_ASTMODULE_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTMODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astneeds.hxx b/idlc/inc/idlc/astneeds.hxx
index 38e95bd217cb..f96a2bb82690 100644
--- a/idlc/inc/idlc/astneeds.hxx
+++ b/idlc/inc/idlc/astneeds.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 _IDLC_ASTNEEDS_HXX_
-#define _IDLC_ASTNEEDS_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTNEEDS_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTNEEDS_HXX
 
 #include <idlc/astservice.hxx>
 
@@ -36,6 +36,6 @@ private:
     AstService* m_pRealService;
 };
 
-#endif // _IDLC_ASTNEEDS_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTNEEDS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astobserves.hxx b/idlc/inc/idlc/astobserves.hxx
index d939073a76de..9f84d0cbeecb 100644
--- a/idlc/inc/idlc/astobserves.hxx
+++ b/idlc/inc/idlc/astobserves.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 _IDLC_ASTOBSERVES_HXX_
-#define _IDLC_ASTOBSERVES_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTOBSERVES_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTOBSERVES_HXX
 
 #include <idlc/astinterface.hxx>
 
@@ -36,6 +36,6 @@ private:
     AstInterface*   m_pRealInterface;
 };
 
-#endif // _IDLC_ASTOBSERVES_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTOBSERVES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/idlc/astoperation.hxx
index 7d7a41c2a432..4eb5e2dafa9d 100644
--- a/idlc/inc/idlc/astoperation.hxx
+++ b/idlc/inc/idlc/astoperation.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 _IDLC_ASTOPERATION_HXX_
-#define _IDLC_ASTOPERATION_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTOPERATION_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTOPERATION_HXX
 
 #include <idlc/astdeclaration.hxx>
 #include <idlc/astscope.hxx>
@@ -56,6 +56,6 @@ private:
     DeclList    m_exceptions;
 };
 
-#endif // _IDLC_ASTOPERATION_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTOPERATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astparameter.hxx b/idlc/inc/idlc/astparameter.hxx
index 7bf8ce05b0c0..18a84d3583f7 100644
--- a/idlc/inc/idlc/astparameter.hxx
+++ b/idlc/inc/idlc/astparameter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _IDLC_ASTPARAMETER_HXX_
-#define _IDLC_ASTPARAMETER_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTPARAMETER_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTPARAMETER_HXX
 
 #include <idlc/astmember.hxx>
 
diff --git a/idlc/inc/idlc/astscope.hxx b/idlc/inc/idlc/astscope.hxx
index c3efcadba5a8..217afaffa940 100644
--- a/idlc/inc/idlc/astscope.hxx
+++ b/idlc/inc/idlc/astscope.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 _IDLC_ASTSCOPE_HXX_
-#define _IDLC_ASTSCOPE_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTSCOPE_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTSCOPE_HXX
 
 #include <idlc/idlc.hxx>
 
@@ -66,6 +66,6 @@ private:
     NodeType    m_nodeType;
 };
 
-#endif // _IDLC_ASTSCOPE_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTSCOPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astsequence.hxx b/idlc/inc/idlc/astsequence.hxx
index 3e62fc76cf6e..6e0eb173693b 100644
--- a/idlc/inc/idlc/astsequence.hxx
+++ b/idlc/inc/idlc/astsequence.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 _IDLC_ASTSEQUENCE_HXX_
-#define _IDLC_ASTSEQUENCE_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTSEQUENCE_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTSEQUENCE_HXX
 
 #include <idlc/asttype.hxx>
 
@@ -47,6 +47,6 @@ private:
     mutable OString* m_pRelativName;
 };
 
-#endif // _IDLC_ASTSEQUENCE_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTSEQUENCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astservice.hxx b/idlc/inc/idlc/astservice.hxx
index 39caf8f9a3c2..e15fa4503709 100644
--- a/idlc/inc/idlc/astservice.hxx
+++ b/idlc/inc/idlc/astservice.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 _IDLC_ASTSERVICE_HXX_
-#define _IDLC_ASTSERVICE_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTSERVICE_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTSERVICE_HXX
 
 #include <idlc/astdeclaration.hxx>
 #include <idlc/astscope.hxx>
@@ -57,6 +57,6 @@ private:
     bool m_defaultConstructor;
 };
 
-#endif // _IDLC_ASTSERVICE_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTSERVICE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astservicemember.hxx b/idlc/inc/idlc/astservicemember.hxx
index 07f364474a8b..0f08527211d8 100644
--- a/idlc/inc/idlc/astservicemember.hxx
+++ b/idlc/inc/idlc/astservicemember.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 _IDLC_ASTSERVICEMEMBER_HXX_
-#define _IDLC_ASTSERVICEMEMBER_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTSERVICEMEMBER_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTSERVICEMEMBER_HXX
 
 #include <idlc/astservice.hxx>
 
@@ -41,6 +41,6 @@ private:
     AstService*         m_pRealService;
 };
 
-#endif // _IDLC_ASTSERVICEMEMBER_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTSERVICEMEMBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/aststack.hxx b/idlc/inc/idlc/aststack.hxx
index 01179a5dd206..500acc5f8f92 100644
--- a/idlc/inc/idlc/aststack.hxx
+++ b/idlc/inc/idlc/aststack.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 _IDLC_ASTSTACK_HXX_
-#define _IDLC_ASTSTACK_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTSTACK_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTSTACK_HXX
 
 #include <sal/types.h>
 
@@ -44,6 +44,6 @@ private:
     sal_uInt32  m_top;
 };
 
-#endif // _IDLC_ASTSTACK_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTSTACK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/aststruct.hxx b/idlc/inc/idlc/aststruct.hxx
index 0b89e203475e..3fa47fbb836d 100644
--- a/idlc/inc/idlc/aststruct.hxx
+++ b/idlc/inc/idlc/aststruct.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 _IDLC_ASTSTRUCT_HXX_
-#define _IDLC_ASTSTRUCT_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTSTRUCT_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTSTRUCT_HXX
 
 #include <idlc/asttype.hxx>
 #include <idlc/astscope.hxx>
@@ -57,6 +57,6 @@ private:
     DeclList m_typeParameters;
 };
 
-#endif // _IDLC_ASTSTRUCT_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTSTRUCT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/aststructinstance.hxx b/idlc/inc/idlc/aststructinstance.hxx
index ae3742a21fb7..ebc7f6c46ae8 100644
--- a/idlc/inc/idlc/aststructinstance.hxx
+++ b/idlc/inc/idlc/aststructinstance.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_idlc_inc_idlc_aststructinstance_hxx
-#define INCLUDED_idlc_inc_idlc_aststructinstance_hxx
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTSTRUCTINSTANCE_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTSTRUCTINSTANCE_HXX
 
 #include "idlc/asttype.hxx"
 #include "idlc/idlctypes.hxx"
diff --git a/idlc/inc/idlc/asttype.hxx b/idlc/inc/idlc/asttype.hxx
index cea157a8d7f9..caecefda4f09 100644
--- a/idlc/inc/idlc/asttype.hxx
+++ b/idlc/inc/idlc/asttype.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 _IDLC_ASTTYPE_HXX_
-#define _IDLC_ASTTYPE_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTTYPE_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTTYPE_HXX
 
 #include <idlc/astdeclaration.hxx>
 
@@ -33,6 +33,6 @@ public:
     virtual bool isUnsigned() const { return false; }
 };
 
-#endif // _IDLC_ASTTYPE_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTTYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/asttypedef.hxx b/idlc/inc/idlc/asttypedef.hxx
index 620932156f61..00665895b14a 100644
--- a/idlc/inc/idlc/asttypedef.hxx
+++ b/idlc/inc/idlc/asttypedef.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 _IDLC_ASTTYPEDEF_HXX_
-#define _IDLC_ASTTYPEDEF_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ASTTYPEDEF_HXX
+#define INCLUDED_IDLC_INC_IDLC_ASTTYPEDEF_HXX
 
 #include <idlc/asttype.hxx>
 
@@ -41,6 +41,6 @@ private:
     AstType const * m_pBaseType;
 };
 
-#endif // _IDLC_ASTTYPEDEF_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ASTTYPEDEF_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/idlc/errorhandler.hxx
index 085aac541545..9877f081221f 100644
--- a/idlc/inc/idlc/errorhandler.hxx
+++ b/idlc/inc/idlc/errorhandler.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 _IDLC_ERRORHANDLER_HXX_
-#define _IDLC_ERRORHANDLER_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_ERRORHANDLER_HXX
+#define INCLUDED_IDLC_INC_IDLC_ERRORHANDLER_HXX
 
 #include <idlc/astdeclaration.hxx>
 #include <idlc/astexpression.hxx>
@@ -127,6 +127,6 @@ public:
     bool checkPublished(AstDeclaration const * decl, bool bOptiional=false);
 };
 
-#endif // _IDLC_ERRORHANDLER_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_ERRORHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/idlc/fehelper.hxx
index 3c3bd65a4141..9c818e10923b 100644
--- a/idlc/inc/idlc/fehelper.hxx
+++ b/idlc/inc/idlc/fehelper.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 _IDLC_FEHELPER_HXX_
-#define _IDLC_FEHELPER_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_FEHELPER_HXX
+#define INCLUDED_IDLC_INC_IDLC_FEHELPER_HXX
 
 #include <idlc/asttype.hxx>
 #include <idlc/astinterface.hxx>
@@ -86,6 +86,6 @@ private:
     std::vector< OString > m_typeParameters;
 };
 
-#endif // _IDLC_FEHELPER_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_FEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/idlc.hxx b/idlc/inc/idlc/idlc.hxx
index 4602ccbfff08..551fe3408947 100644
--- a/idlc/inc/idlc/idlc.hxx
+++ b/idlc/inc/idlc/idlc.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 _IDLC_IDLC_HXX_
-#define _IDLC_IDLC_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_IDLC_HXX
+#define INCLUDED_IDLC_INC_IDLC_IDLC_HXX
 
 #include <idlc/idlctypes.hxx>
 #include <idlc/aststack.hxx>
@@ -170,6 +170,6 @@ AstDeclaration const * deconstructAndResolveTypedefs(
 
 AstInterface const * resolveInterfaceTypedefs(AstType const * type);
 
-#endif // _IDLC_IDLC_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_IDLC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx
index 33e7a68b3900..12c73491980e 100644
--- a/idlc/inc/idlc/idlctypes.hxx
+++ b/idlc/inc/idlc/idlctypes.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 _IDLC_IDLCTYPES_HXX_
-#define _IDLC_IDLCTYPES_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_IDLCTYPES_HXX
+#define INCLUDED_IDLC_INC_IDLC_IDLCTYPES_HXX
 
 #include <stdio.h>
 
@@ -221,6 +221,6 @@ enum ParseState
     PS_DeclsDeclSeen        // Seen complete decl in decls list
 };
 
-#endif // _IDLC_IDLCTYPES_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_IDLCTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/inheritedinterface.hxx b/idlc/inc/idlc/inheritedinterface.hxx
index 41134e57caef..603b8a818bbe 100644
--- a/idlc/inc/idlc/inheritedinterface.hxx
+++ b/idlc/inc/idlc/inheritedinterface.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_idlc_inc_idlc_inheritedinterface_hxx
-#define INCLUDED_idlc_inc_idlc_inheritedinterface_hxx
+#ifndef INCLUDED_IDLC_INC_IDLC_INHERITEDINTERFACE_HXX
+#define INCLUDED_IDLC_INC_IDLC_INHERITEDINTERFACE_HXX
 
 #include "idlc/idlc.hxx"
 
diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/idlc/options.hxx
index 5e9ca97110f1..5a1b40b2639c 100644
--- a/idlc/inc/idlc/options.hxx
+++ b/idlc/inc/idlc/options.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _IDLC_OPTIONS_HXX_
-#define _IDLC_OPTIONS_HXX_
+#ifndef INCLUDED_IDLC_INC_IDLC_OPTIONS_HXX
+#define INCLUDED_IDLC_INC_IDLC_OPTIONS_HXX
 
 #include <idlc/idlctypes.hxx>
 
@@ -79,6 +79,6 @@ protected:
     OptionMap       m_options;
 };
 
-#endif // _IDLC_OPTIONS_HXX_
+#endif // INCLUDED_IDLC_INC_IDLC_OPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/attributeexceptions.hxx b/idlc/source/attributeexceptions.hxx
index 7c47f74ad685..aa19b49a1558 100644
--- a/idlc/source/attributeexceptions.hxx
+++ b/idlc/source/attributeexceptions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_idlc_source_attributeexceptions_hxx
-#define INCLUDED_idlc_source_attributeexceptions_hxx
+#ifndef INCLUDED_IDLC_SOURCE_ATTRIBUTEEXCEPTIONS_HXX
+#define INCLUDED_IDLC_SOURCE_ATTRIBUTEEXCEPTIONS_HXX
 
 #include "rtl/ustring.hxx"