Get rid of unnecessary directory levels $D/inc/$D

Change-Id: Ibf313b8948a493043006ebf3a8281487c1f67b48
Reviewed-on: https://gerrit.libreoffice.org/25532
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>

52 files changed, 232 insertions, 232 deletions

diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/astattribute.hxx
index 86e4c0de7c74..2d88b47e4082 100644
--- a/idlc/inc/idlc/astattribute.hxx
+++ b/idlc/inc/astattribute.hxx
@@ -16,11 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTATTRIBUTE_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTATTRIBUTE_HXX
+#ifndef INCLUDED_IDLC_INC_ASTATTRIBUTE_HXX
+#define INCLUDED_IDLC_INC_ASTATTRIBUTE_HXX
 
-#include <idlc/astdeclaration.hxx>
-#include "idlc/astscope.hxx"
+#include <astdeclaration.hxx>
+#include "astscope.hxx"
 
 #include <registry/types.hxx>
 #include <rtl/ustring.hxx>
@@ -105,6 +105,6 @@ private:
     DeclList m_setExceptions;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTATTRIBUTE_HXX
+#endif // INCLUDED_IDLC_INC_ASTATTRIBUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astbasetype.hxx b/idlc/inc/astbasetype.hxx
index 048e8bb42b1a..a7edf3d817b0 100644
--- a/idlc/inc/idlc/astbasetype.hxx
+++ b/idlc/inc/astbasetype.hxx
@@ -16,11 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTBASETYPE_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTBASETYPE_HXX
+#ifndef INCLUDED_IDLC_INC_ASTBASETYPE_HXX
+#define INCLUDED_IDLC_INC_ASTBASETYPE_HXX
 
-#include <idlc/asttype.hxx>
-#include <idlc/astexpression.hxx>
+#include <asttype.hxx>
+#include <astexpression.hxx>
 
 
 class AstBaseType : public AstType
@@ -50,6 +50,6 @@ private:
     const ExprType m_exprType;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTBASETYPE_HXX
+#endif // INCLUDED_IDLC_INC_ASTBASETYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astconstant.hxx b/idlc/inc/astconstant.hxx
index cfad728f6aaf..7453c47954b3 100644
--- a/idlc/inc/idlc/astconstant.hxx
+++ b/idlc/inc/astconstant.hxx
@@ -16,11 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTCONSTANT_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTCONSTANT_HXX
+#ifndef INCLUDED_IDLC_INC_ASTCONSTANT_HXX
+#define INCLUDED_IDLC_INC_ASTCONSTANT_HXX
 
-#include <idlc/astdeclaration.hxx>
-#include <idlc/astexpression.hxx>
+#include <astdeclaration.hxx>
+#include <astexpression.hxx>
 
 namespace typereg { class Writer; }
 
@@ -45,6 +45,6 @@ private:
     const ExprType  m_constValueType;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTCONSTANT_HXX
+#endif // INCLUDED_IDLC_INC_ASTCONSTANT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astconstants.hxx b/idlc/inc/astconstants.hxx
index 65b2da863dca..f3f7f3bed2d1 100644
--- a/idlc/inc/idlc/astconstants.hxx
+++ b/idlc/inc/astconstants.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTCONSTANTS_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTCONSTANTS_HXX
+#ifndef INCLUDED_IDLC_INC_ASTCONSTANTS_HXX
+#define INCLUDED_IDLC_INC_ASTCONSTANTS_HXX
 
-#include <idlc/astmodule.hxx>
+#include <astmodule.hxx>
 
 class AstConstants : public AstModule
 {
@@ -30,6 +30,6 @@ public:
     virtual ~AstConstants() {}
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTCONSTANTS_HXX
+#endif // INCLUDED_IDLC_INC_ASTCONSTANTS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/astdeclaration.hxx
index 6b329e961a7c..c6a76d9aa4a2 100644
--- a/idlc/inc/idlc/astdeclaration.hxx
+++ b/idlc/inc/astdeclaration.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTDECLARATION_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTDECLARATION_HXX
+#ifndef INCLUDED_IDLC_INC_ASTDECLARATION_HXX
+#define INCLUDED_IDLC_INC_ASTDECLARATION_HXX
 
-#include <idlc/idlc.hxx>
+#include <idlc.hxx>
 #include <registry/registry.hxx>
 
 class AstScope;
@@ -127,6 +127,6 @@ protected:
     OUString     m_documentation;    // fileName defined in
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTDECLARATION_HXX
+#endif // INCLUDED_IDLC_INC_ASTDECLARATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astenum.hxx b/idlc/inc/astenum.hxx
index 0bdf764905a6..c60ff2839bfe 100644
--- a/idlc/inc/idlc/astenum.hxx
+++ b/idlc/inc/astenum.hxx
@@ -16,12 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTENUM_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTENUM_HXX
+#ifndef INCLUDED_IDLC_INC_ASTENUM_HXX
+#define INCLUDED_IDLC_INC_ASTENUM_HXX
 
-#include <idlc/asttype.hxx>
-#include <idlc/astscope.hxx>
-#include <idlc/astconstant.hxx>
+#include <asttype.hxx>
+#include <astscope.hxx>
+#include <astconstant.hxx>
 
 class AstEnum : public AstType
               , public AstScope
@@ -43,6 +43,6 @@ private:
     sal_Int32   m_enumValueCount;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTENUM_HXX
+#endif // INCLUDED_IDLC_INC_ASTENUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astexception.hxx b/idlc/inc/astexception.hxx
index efa9805d868f..64790c694048 100644
--- a/idlc/inc/idlc/astexception.hxx
+++ b/idlc/inc/astexception.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTEXCEPTION_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTEXCEPTION_HXX
+#ifndef INCLUDED_IDLC_INC_ASTEXCEPTION_HXX
+#define INCLUDED_IDLC_INC_ASTEXCEPTION_HXX
 
-#include <idlc/aststruct.hxx>
+#include <aststruct.hxx>
 
 class AstException : public AstStruct
 {
@@ -31,6 +31,6 @@ public:
     virtual ~AstException() {}
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTEXCEPTION_HXX
+#endif // INCLUDED_IDLC_INC_ASTEXCEPTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/astexpression.hxx
index 4e51e8bfb51a..ca060719ef2e 100644
--- a/idlc/inc/idlc/astexpression.hxx
+++ b/idlc/inc/astexpression.hxx
@@ -16,14 +16,14 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTEXPRESSION_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTEXPRESSION_HXX
+#ifndef INCLUDED_IDLC_INC_ASTEXPRESSION_HXX
+#define INCLUDED_IDLC_INC_ASTEXPRESSION_HXX
 
 #include <sal/config.h>
 
 #include <memory>
 
-#include <idlc/idlc.hxx>
+#include <idlc.hxx>
 
 // Enum to define all the different operators to combine expressions
 enum ExprComb
@@ -138,6 +138,6 @@ private:
     OString* m_pSymbolicName;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTEXPRESSION_HXX
+#endif // INCLUDED_IDLC_INC_ASTEXPRESSION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/astinterface.hxx
index 99f9dee5eea5..caabbe669f11 100644
--- a/idlc/inc/idlc/astinterface.hxx
+++ b/idlc/inc/astinterface.hxx
@@ -16,12 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTINTERFACE_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTINTERFACE_HXX
+#ifndef INCLUDED_IDLC_INC_ASTINTERFACE_HXX
+#define INCLUDED_IDLC_INC_ASTINTERFACE_HXX
 
-#include <idlc/asttype.hxx>
-#include <idlc/astscope.hxx>
-#include "idlc/inheritedinterface.hxx"
+#include <asttype.hxx>
+#include <astscope.hxx>
+#include "inheritedinterface.hxx"
 
 #include <map>
 #include <vector>
@@ -121,6 +121,6 @@ private:
     VisibleMembers m_visibleMembers;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTINTERFACE_HXX
+#endif // INCLUDED_IDLC_INC_ASTINTERFACE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astinterfacemember.hxx b/idlc/inc/astinterfacemember.hxx
index faaba11b939d..1740d3518085 100644
--- a/idlc/inc/idlc/astinterfacemember.hxx
+++ b/idlc/inc/astinterfacemember.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTINTERFACEMEMBER_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTINTERFACEMEMBER_HXX
+#ifndef INCLUDED_IDLC_INC_ASTINTERFACEMEMBER_HXX
+#define INCLUDED_IDLC_INC_ASTINTERFACEMEMBER_HXX
 
-#include <idlc/astinterface.hxx>
+#include <astinterface.hxx>
 
 class AstInterfaceMember : public AstDeclaration
 {
@@ -41,6 +41,6 @@ private:
     AstInterface*       m_pRealInterface;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTINTERFACEMEMBER_HXX
+#endif // INCLUDED_IDLC_INC_ASTINTERFACEMEMBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astmember.hxx b/idlc/inc/astmember.hxx
index 52a5042e0226..d01dbde7922c 100644
--- a/idlc/inc/idlc/astmember.hxx
+++ b/idlc/inc/astmember.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTMEMBER_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTMEMBER_HXX
+#ifndef INCLUDED_IDLC_INC_ASTMEMBER_HXX
+#define INCLUDED_IDLC_INC_ASTMEMBER_HXX
 
-#include "idlc/astdeclaration.hxx"
+#include "astdeclaration.hxx"
 
 class AstScope;
 class AstType;
diff --git a/idlc/inc/idlc/astmodule.hxx b/idlc/inc/astmodule.hxx
index 37bf965a7c05..770c11a856a9 100644
--- a/idlc/inc/idlc/astmodule.hxx
+++ b/idlc/inc/astmodule.hxx
@@ -16,11 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTMODULE_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTMODULE_HXX
+#ifndef INCLUDED_IDLC_INC_ASTMODULE_HXX
+#define INCLUDED_IDLC_INC_ASTMODULE_HXX
 
-#include <idlc/astdeclaration.hxx>
-#include <idlc/astscope.hxx>
+#include <astdeclaration.hxx>
+#include <astscope.hxx>
 
 class AstModule : public AstDeclaration
                 , public AstScope
@@ -39,6 +39,6 @@ public:
     virtual bool dump(RegistryKey& rKey) override;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTMODULE_HXX
+#endif // INCLUDED_IDLC_INC_ASTMODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astneeds.hxx b/idlc/inc/astneeds.hxx
index f96a2bb82690..6674e2804695 100644
--- a/idlc/inc/idlc/astneeds.hxx
+++ b/idlc/inc/astneeds.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTNEEDS_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTNEEDS_HXX
+#ifndef INCLUDED_IDLC_INC_ASTNEEDS_HXX
+#define INCLUDED_IDLC_INC_ASTNEEDS_HXX
 
-#include <idlc/astservice.hxx>
+#include <astservice.hxx>
 
 class AstNeeds : public AstDeclaration
 {
@@ -36,6 +36,6 @@ private:
     AstService* m_pRealService;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTNEEDS_HXX
+#endif // INCLUDED_IDLC_INC_ASTNEEDS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astobserves.hxx b/idlc/inc/astobserves.hxx
index 9f84d0cbeecb..c7760096a095 100644
--- a/idlc/inc/idlc/astobserves.hxx
+++ b/idlc/inc/astobserves.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTOBSERVES_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTOBSERVES_HXX
+#ifndef INCLUDED_IDLC_INC_ASTOBSERVES_HXX
+#define INCLUDED_IDLC_INC_ASTOBSERVES_HXX
 
-#include <idlc/astinterface.hxx>
+#include <astinterface.hxx>
 
 class AstObserves : public AstDeclaration
 {
@@ -36,6 +36,6 @@ private:
     AstInterface*   m_pRealInterface;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTOBSERVES_HXX
+#endif // INCLUDED_IDLC_INC_ASTOBSERVES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/astoperation.hxx
index a0a4f7b86cc6..775c74fc0c43 100644
--- a/idlc/inc/idlc/astoperation.hxx
+++ b/idlc/inc/astoperation.hxx
@@ -16,11 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTOPERATION_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTOPERATION_HXX
+#ifndef INCLUDED_IDLC_INC_ASTOPERATION_HXX
+#define INCLUDED_IDLC_INC_ASTOPERATION_HXX
 
-#include <idlc/astdeclaration.hxx>
-#include <idlc/astscope.hxx>
+#include <astdeclaration.hxx>
+#include <astscope.hxx>
 
 namespace typereg { class Writer; }
 
@@ -54,6 +54,6 @@ private:
     DeclList    m_exceptions;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTOPERATION_HXX
+#endif // INCLUDED_IDLC_INC_ASTOPERATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astparameter.hxx b/idlc/inc/astparameter.hxx
index 18a84d3583f7..250aeaed33f5 100644
--- a/idlc/inc/idlc/astparameter.hxx
+++ b/idlc/inc/astparameter.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTPARAMETER_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTPARAMETER_HXX
+#ifndef INCLUDED_IDLC_INC_ASTPARAMETER_HXX
+#define INCLUDED_IDLC_INC_ASTPARAMETER_HXX
 
-#include <idlc/astmember.hxx>
+#include <astmember.hxx>
 
 enum Direction { DIR_IN, DIR_OUT, DIR_INOUT };
 
diff --git a/idlc/inc/idlc/astscope.hxx b/idlc/inc/astscope.hxx
index c7d64a16dc2e..9db54d61aa13 100644
--- a/idlc/inc/idlc/astscope.hxx
+++ b/idlc/inc/astscope.hxx
@@ -16,14 +16,14 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTSCOPE_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTSCOPE_HXX
+#ifndef INCLUDED_IDLC_INC_ASTSCOPE_HXX
+#define INCLUDED_IDLC_INC_ASTSCOPE_HXX
 
-#include <idlc/idlc.hxx>
+#include <idlc.hxx>
 
 class AstExpression;
-#include <idlc/astdeclaration.hxx>
-#include <idlc/astexpression.hxx>
+#include <astdeclaration.hxx>
+#include <astexpression.hxx>
 
 class AstScope
 {
@@ -65,6 +65,6 @@ private:
     NodeType    m_nodeType;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTSCOPE_HXX
+#endif // INCLUDED_IDLC_INC_ASTSCOPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astsequence.hxx b/idlc/inc/astsequence.hxx
index 1eefbea3f949..bdc132872455 100644
--- a/idlc/inc/idlc/astsequence.hxx
+++ b/idlc/inc/astsequence.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTSEQUENCE_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTSEQUENCE_HXX
+#ifndef INCLUDED_IDLC_INC_ASTSEQUENCE_HXX
+#define INCLUDED_IDLC_INC_ASTSEQUENCE_HXX
 
-#include <idlc/asttype.hxx>
+#include <asttype.hxx>
 
 class AstSequence : public AstType
 {
@@ -47,6 +47,6 @@ private:
     mutable OString* m_pRelativName;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTSEQUENCE_HXX
+#endif // INCLUDED_IDLC_INC_ASTSEQUENCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astservice.hxx b/idlc/inc/astservice.hxx
index 8112db6a3652..400e7c6f2313 100644
--- a/idlc/inc/idlc/astservice.hxx
+++ b/idlc/inc/astservice.hxx
@@ -16,11 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTSERVICE_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTSERVICE_HXX
+#ifndef INCLUDED_IDLC_INC_ASTSERVICE_HXX
+#define INCLUDED_IDLC_INC_ASTSERVICE_HXX
 
-#include <idlc/astdeclaration.hxx>
-#include <idlc/astscope.hxx>
+#include <astdeclaration.hxx>
+#include <astscope.hxx>
 
 class AstService : public AstDeclaration
                  , public AstScope
@@ -57,6 +57,6 @@ private:
     bool m_defaultConstructor;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTSERVICE_HXX
+#endif // INCLUDED_IDLC_INC_ASTSERVICE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astservicemember.hxx b/idlc/inc/astservicemember.hxx
index 0f08527211d8..13cd97298bf7 100644
--- a/idlc/inc/idlc/astservicemember.hxx
+++ b/idlc/inc/astservicemember.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTSERVICEMEMBER_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTSERVICEMEMBER_HXX
+#ifndef INCLUDED_IDLC_INC_ASTSERVICEMEMBER_HXX
+#define INCLUDED_IDLC_INC_ASTSERVICEMEMBER_HXX
 
-#include <idlc/astservice.hxx>
+#include <astservice.hxx>
 
 class AstServiceMember : public AstDeclaration
 {
@@ -41,6 +41,6 @@ private:
     AstService*         m_pRealService;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTSERVICEMEMBER_HXX
+#endif // INCLUDED_IDLC_INC_ASTSERVICEMEMBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/aststack.hxx b/idlc/inc/aststack.hxx
index 0a63c31e2331..c704e91f91b3 100644
--- a/idlc/inc/idlc/aststack.hxx
+++ b/idlc/inc/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 INCLUDED_IDLC_INC_IDLC_ASTSTACK_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTSTACK_HXX
+#ifndef INCLUDED_IDLC_INC_ASTSTACK_HXX
+#define INCLUDED_IDLC_INC_ASTSTACK_HXX
 
 #include <sal/types.h>
 
@@ -44,6 +44,6 @@ private:
     sal_uInt32  m_top;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTSTACK_HXX
+#endif // INCLUDED_IDLC_INC_ASTSTACK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/aststruct.hxx b/idlc/inc/aststruct.hxx
index 2a3330bf6114..280f23165d43 100644
--- a/idlc/inc/idlc/aststruct.hxx
+++ b/idlc/inc/aststruct.hxx
@@ -16,12 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTSTRUCT_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTSTRUCT_HXX
+#ifndef INCLUDED_IDLC_INC_ASTSTRUCT_HXX
+#define INCLUDED_IDLC_INC_ASTSTRUCT_HXX
 
-#include <idlc/asttype.hxx>
-#include <idlc/astscope.hxx>
-#include "idlc/idlctypes.hxx"
+#include <asttype.hxx>
+#include <astscope.hxx>
+#include "idlctypes.hxx"
 
 class AstStruct;
 
@@ -53,6 +53,6 @@ private:
     DeclList m_typeParameters;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTSTRUCT_HXX
+#endif // INCLUDED_IDLC_INC_ASTSTRUCT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/aststructinstance.hxx b/idlc/inc/aststructinstance.hxx
index 706d6cb1c0db..877fcd249ed1 100644
--- a/idlc/inc/idlc/aststructinstance.hxx
+++ b/idlc/inc/aststructinstance.hxx
@@ -17,11 +17,11 @@
  *   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_ASTSTRUCTINSTANCE_HXX
+#define INCLUDED_IDLC_INC_ASTSTRUCTINSTANCE_HXX
 
-#include "idlc/asttype.hxx"
-#include "idlc/idlctypes.hxx"
+#include "asttype.hxx"
+#include "idlctypes.hxx"
 
 class AstScope;
 
diff --git a/idlc/inc/idlc/asttype.hxx b/idlc/inc/asttype.hxx
index caecefda4f09..67f8d4d075ee 100644
--- a/idlc/inc/idlc/asttype.hxx
+++ b/idlc/inc/asttype.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTTYPE_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTTYPE_HXX
+#ifndef INCLUDED_IDLC_INC_ASTTYPE_HXX
+#define INCLUDED_IDLC_INC_ASTTYPE_HXX
 
-#include <idlc/astdeclaration.hxx>
+#include <astdeclaration.hxx>
 
 class AstType : public AstDeclaration
 {
@@ -33,6 +33,6 @@ public:
     virtual bool isUnsigned() const { return false; }
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTTYPE_HXX
+#endif // INCLUDED_IDLC_INC_ASTTYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/asttypedef.hxx b/idlc/inc/asttypedef.hxx
index d31b7d62fc6f..2f9017200592 100644
--- a/idlc/inc/idlc/asttypedef.hxx
+++ b/idlc/inc/asttypedef.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ASTTYPEDEF_HXX
-#define INCLUDED_IDLC_INC_IDLC_ASTTYPEDEF_HXX
+#ifndef INCLUDED_IDLC_INC_ASTTYPEDEF_HXX
+#define INCLUDED_IDLC_INC_ASTTYPEDEF_HXX
 
-#include <idlc/asttype.hxx>
+#include <asttype.hxx>
 
 class AstTypeDef : public AstType
 {
@@ -41,6 +41,6 @@ private:
     AstType const * m_pBaseType;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ASTTYPEDEF_HXX
+#endif // INCLUDED_IDLC_INC_ASTTYPEDEF_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/errorhandler.hxx
index 7f7fd614fc43..8770cc93ac61 100644
--- a/idlc/inc/idlc/errorhandler.hxx
+++ b/idlc/inc/errorhandler.hxx
@@ -16,12 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_ERRORHANDLER_HXX
-#define INCLUDED_IDLC_INC_IDLC_ERRORHANDLER_HXX
+#ifndef INCLUDED_IDLC_INC_ERRORHANDLER_HXX
+#define INCLUDED_IDLC_INC_ERRORHANDLER_HXX
 
-#include <idlc/astdeclaration.hxx>
-#include <idlc/astexpression.hxx>
-#include <idlc/astenum.hxx>
+#include <astdeclaration.hxx>
+#include <astexpression.hxx>
+#include <astenum.hxx>
 
 enum ErrorCode
 {
@@ -127,6 +127,6 @@ public:
     static bool checkPublished(AstDeclaration const * decl, bool bOptional=false);
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_ERRORHANDLER_HXX
+#endif // INCLUDED_IDLC_INC_ERRORHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/fehelper.hxx
index 1af64561a128..61bc51638dad 100644
--- a/idlc/inc/idlc/fehelper.hxx
+++ b/idlc/inc/fehelper.hxx
@@ -16,11 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_FEHELPER_HXX
-#define INCLUDED_IDLC_INC_IDLC_FEHELPER_HXX
+#ifndef INCLUDED_IDLC_INC_FEHELPER_HXX
+#define INCLUDED_IDLC_INC_FEHELPER_HXX
 
-#include <idlc/asttype.hxx>
-#include <idlc/astinterface.hxx>
+#include <asttype.hxx>
+#include <astinterface.hxx>
 
 #include <vector>
 
@@ -71,6 +71,6 @@ private:
     std::vector< OString > m_typeParameters;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_FEHELPER_HXX
+#endif // INCLUDED_IDLC_INC_FEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/idlc.hxx b/idlc/inc/idlc.hxx
index 7d92c7f9493e..56fda18c9386 100644
--- a/idlc/inc/idlc/idlc.hxx
+++ b/idlc/inc/idlc.hxx
@@ -16,12 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_IDLC_INC_IDLC_IDLC_HXX
-#define INCLUDED_IDLC_INC_IDLC_IDLC_HXX
+#ifndef INCLUDED_IDLC_INC_IDLC_HXX
+#define INCLUDED_IDLC_INC_IDLC_HXX
 
-#include <idlc/idlctypes.hxx>
-#include <idlc/aststack.hxx>
-#include <idlc/options.hxx>
+#include <idlctypes.hxx>
+#include <aststack.hxx>
+#include <options.hxx>
 
 #ifdef SAL_UNX
 #define SEPARATOR '/'
@@ -161,6 +161,6 @@ AstDeclaration const * deconstructAndResolveTypedefs(
 
 AstInterface const * resolveInterfaceTypedefs(AstType const * type);
 
-#endif // INCLUDED_IDLC_INC_IDLC_IDLC_HXX
+#endif // INCLUDED_IDLC_INC_IDLC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlctypes.hxx
index bbea0ba45cf0..36903ce8f7e6 100644
--- a/idlc/inc/idlc/idlctypes.hxx
+++ b/idlc/inc/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 INCLUDED_IDLC_INC_IDLC_IDLCTYPES_HXX
-#define INCLUDED_IDLC_INC_IDLC_IDLCTYPES_HXX
+#ifndef INCLUDED_IDLC_INC_IDLCTYPES_HXX
+#define INCLUDED_IDLC_INC_IDLCTYPES_HXX
 
 #include <stdio.h>
 
@@ -204,6 +204,6 @@ enum ParseState
     PS_DeclsDeclSeen        // Seen complete decl in decls list
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_IDLCTYPES_HXX
+#endif // INCLUDED_IDLC_INC_IDLCTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/inheritedinterface.hxx b/idlc/inc/inheritedinterface.hxx
index afe0c99b9207..10e6ace39342 100644
--- a/idlc/inc/idlc/inheritedinterface.hxx
+++ b/idlc/inc/inheritedinterface.hxx
@@ -17,10 +17,10 @@
  *   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_INHERITEDINTERFACE_HXX
+#define INCLUDED_IDLC_INC_INHERITEDINTERFACE_HXX
 
-#include "idlc/idlc.hxx"
+#include "idlc.hxx"
 
 #include <rtl/ustring.hxx>
 
diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/options.hxx
index 2f4c02dcd404..3fbfc4586d1f 100644
--- a/idlc/inc/idlc/options.hxx
+++ b/idlc/inc/options.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_IDLC_INC_IDLC_OPTIONS_HXX
-#define INCLUDED_IDLC_INC_IDLC_OPTIONS_HXX
+#ifndef INCLUDED_IDLC_INC_OPTIONS_HXX
+#define INCLUDED_IDLC_INC_OPTIONS_HXX
 
-#include <idlc/idlctypes.hxx>
+#include <idlctypes.hxx>
 
 typedef std::unordered_map< OString,
                          OString,
@@ -78,6 +78,6 @@ protected:
     OptionMap       m_options;
 };
 
-#endif // INCLUDED_IDLC_INC_IDLC_OPTIONS_HXX
+#endif // INCLUDED_IDLC_INC_OPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astconstant.cxx b/idlc/source/astconstant.cxx
index ce38dcbfa461..54d235fa32ed 100644
--- a/idlc/source/astconstant.cxx
+++ b/idlc/source/astconstant.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/astconstant.hxx>
-#include <idlc/astscope.hxx>
+#include <astconstant.hxx>
+#include <astscope.hxx>
 
 #include <registry/writer.hxx>
 
diff --git a/idlc/source/astdeclaration.cxx b/idlc/source/astdeclaration.cxx
index fa889f96ab33..064cc324480c 100644
--- a/idlc/source/astdeclaration.cxx
+++ b/idlc/source/astdeclaration.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/astdeclaration.hxx>
-#include <idlc/astscope.hxx>
+#include <astdeclaration.hxx>
+#include <astscope.hxx>
 #include <rtl/strbuf.hxx>
 #include <osl/diagnose.h>
 
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index c8a87ec77bbc..9c84e54218ea 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/astmodule.hxx>
-#include <idlc/asttypedef.hxx>
-#include <idlc/astservice.hxx>
-#include <idlc/astconstant.hxx>
-#include <idlc/astattribute.hxx>
-#include <idlc/astinterfacemember.hxx>
-#include <idlc/astservicemember.hxx>
-#include <idlc/astobserves.hxx>
-#include <idlc/astneeds.hxx>
-#include <idlc/astsequence.hxx>
-#include "idlc/astoperation.hxx"
+#include <astmodule.hxx>
+#include <asttypedef.hxx>
+#include <astservice.hxx>
+#include <astconstant.hxx>
+#include <astattribute.hxx>
+#include <astinterfacemember.hxx>
+#include <astservicemember.hxx>
+#include <astobserves.hxx>
+#include <astneeds.hxx>
+#include <astsequence.hxx>
+#include "astoperation.hxx"
 
 #include <osl/diagnose.h>
 
diff --git a/idlc/source/astenum.cxx b/idlc/source/astenum.cxx
index cb2a4572b3b1..f3a20fce50b8 100644
--- a/idlc/source/astenum.cxx
+++ b/idlc/source/astenum.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/astenum.hxx>
+#include <astenum.hxx>
 
 #include <registry/version.h>
 #include <registry/writer.hxx>
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index 2ffd67fd3a27..4e583b35e43c 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include <idlc/astexpression.hxx>
-#include <idlc/astconstant.hxx>
-#include <idlc/astscope.hxx>
-#include <idlc/errorhandler.hxx>
+#include <astexpression.hxx>
+#include <astconstant.hxx>
+#include <astscope.hxx>
+#include <errorhandler.hxx>
 
 #include <osl/diagnose.h>
 
diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx
index e1336fb0a3f5..8add687cc0be 100644
--- a/idlc/source/astinterface.cxx
+++ b/idlc/source/astinterface.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/astinterface.hxx>
-#include <idlc/astattribute.hxx>
-#include <idlc/astoperation.hxx>
-#include "idlc/idlc.hxx"
+#include <astinterface.hxx>
+#include <astattribute.hxx>
+#include <astoperation.hxx>
+#include "idlc.hxx"
 
 #include <registry/version.h>
 #include <registry/writer.hxx>
diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx
index 921a3e5365b1..78c4e452a915 100644
--- a/idlc/source/astoperation.cxx
+++ b/idlc/source/astoperation.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/astoperation.hxx>
-#include <idlc/asttype.hxx>
-#include <idlc/astbasetype.hxx>
-#include <idlc/astparameter.hxx>
-#include <idlc/errorhandler.hxx>
+#include <astoperation.hxx>
+#include <asttype.hxx>
+#include <astbasetype.hxx>
+#include <astparameter.hxx>
+#include <errorhandler.hxx>
 
 #include <registry/writer.hxx>
 
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx
index 23b62fa45675..7c064bd9dc3b 100644
--- a/idlc/source/astscope.cxx
+++ b/idlc/source/astscope.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/astscope.hxx>
-#include <idlc/astbasetype.hxx>
-#include <idlc/astinterface.hxx>
-#include <idlc/errorhandler.hxx>
+#include <astscope.hxx>
+#include <astbasetype.hxx>
+#include <astinterface.hxx>
+#include <errorhandler.hxx>
 #include <osl/diagnose.h>
 
 
diff --git a/idlc/source/astservice.cxx b/idlc/source/astservice.cxx
index 794a527d9fea..83cb3fbd35c9 100644
--- a/idlc/source/astservice.cxx
+++ b/idlc/source/astservice.cxx
@@ -20,10 +20,10 @@
 
 #include <sal/config.h>
 
-#include "idlc/astmember.hxx"
-#include "idlc/astoperation.hxx"
-#include "idlc/astservice.hxx"
-#include "idlc/asttype.hxx"
+#include "astmember.hxx"
+#include "astoperation.hxx"
+#include "astservice.hxx"
+#include "asttype.hxx"
 
 bool AstService::checkLastConstructor() const {
     AstOperation const * last = static_cast< AstOperation const * >(getLast());
diff --git a/idlc/source/aststack.cxx b/idlc/source/aststack.cxx
index 83fed47377eb..1eaddbaabb42 100644
--- a/idlc/source/aststack.cxx
+++ b/idlc/source/aststack.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <rtl/alloc.h>
-#include <idlc/aststack.hxx>
-#include <idlc/astscope.hxx>
+#include <aststack.hxx>
+#include <astscope.hxx>
 
 #define STACKSIZE_INCREMENT 64
 
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx
index 2fb9d6ffc869..5245f06c90f8 100644
--- a/idlc/source/aststruct.cxx
+++ b/idlc/source/aststruct.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/aststruct.hxx>
-#include <idlc/astmember.hxx>
+#include <aststruct.hxx>
+#include <astmember.hxx>
 
 #include <registry/version.h>
 #include <registry/writer.hxx>
diff --git a/idlc/source/aststructinstance.cxx b/idlc/source/aststructinstance.cxx
index 3c5bb6740c34..0c18d7273901 100644
--- a/idlc/source/aststructinstance.cxx
+++ b/idlc/source/aststructinstance.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include "idlc/aststructinstance.hxx"
+#include "aststructinstance.hxx"
 
-#include "idlc/asttype.hxx"
-#include "idlc/idlctypes.hxx"
+#include "asttype.hxx"
+#include "idlctypes.hxx"
 
 #include <rtl/strbuf.hxx>
 #include <rtl/string.hxx>
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx
index 5ed259f46a37..ed8f0cbd0801 100644
--- a/idlc/source/errorhandler.cxx
+++ b/idlc/source/errorhandler.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/errorhandler.hxx>
-#include <idlc/astinterface.hxx>
+#include <errorhandler.hxx>
+#include <astinterface.hxx>
 
 static const sal_Char* errorCodeToMessage(ErrorCode eCode)
 {
diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx
index 704c9539c2a1..47cb63af32bd 100644
--- a/idlc/source/fehelper.cxx
+++ b/idlc/source/fehelper.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/fehelper.hxx>
-#include <idlc/errorhandler.hxx>
-#include "idlc/idlc.hxx"
+#include <fehelper.hxx>
+#include <errorhandler.hxx>
+#include "idlc.hxx"
 
 FeDeclarator::FeDeclarator(const OString& name)
     : m_name(name)
diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx
index 97fe49a2a1bc..74e4c35dd457 100644
--- a/idlc/source/idlc.cxx
+++ b/idlc/source/idlc.cxx
@@ -17,22 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/idlc.hxx>
-#include <idlc/errorhandler.hxx>
-#include <idlc/astscope.hxx>
-#include <idlc/astmodule.hxx>
-#include <idlc/astservice.hxx>
-#include <idlc/astconstants.hxx>
-#include <idlc/astexception.hxx>
-#include <idlc/astenum.hxx>
-#include <idlc/astinterface.hxx>
-#include <idlc/astoperation.hxx>
-#include <idlc/astbasetype.hxx>
-#include "idlc/astdeclaration.hxx"
-#include "idlc/astparameter.hxx"
-#include "idlc/astsequence.hxx"
-#include "idlc/asttype.hxx"
-#include "idlc/asttypedef.hxx"
+#include <idlc.hxx>
+#include <errorhandler.hxx>
+#include <astscope.hxx>
+#include <astmodule.hxx>
+#include <astservice.hxx>
+#include <astconstants.hxx>
+#include <astexception.hxx>
+#include <astenum.hxx>
+#include <astinterface.hxx>
+#include <astoperation.hxx>
+#include <astbasetype.hxx>
+#include "astdeclaration.hxx"
+#include "astparameter.hxx"
+#include "astsequence.hxx"
+#include "asttype.hxx"
+#include "asttypedef.hxx"
 
 #include <osl/diagnose.h>
 #include <osl/file.hxx>
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 26431583bf29..1cc5fac9005d 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/idlc.hxx>
+#include <idlc.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/strbuf.hxx>
 #include <osl/process.h>
diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx
index 616a3aa135bf..d610246dcc46 100644
--- a/idlc/source/idlcmain.cxx
+++ b/idlc/source/idlcmain.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "idlc/idlc.hxx"
+#include "idlc.hxx"
 #include <sal/main.h>
 
 #include <string.h>
diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx
index fba3d6bbe0af..1588dd312154 100644
--- a/idlc/source/idlcproduce.cxx
+++ b/idlc/source/idlcproduce.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <idlc/idlc.hxx>
-#include <idlc/astmodule.hxx>
+#include <idlc.hxx>
+#include <astmodule.hxx>
 #include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.h>
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index 23de54ad0728..9a3eee6daf47 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "idlc/options.hxx"
+#include "options.hxx"
 
 #include <osl/diagnose.h>
 #include <rtl/string.hxx>
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index edd636cdd776..c0459163ed80 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -24,27 +24,27 @@
 %{
 #include <string.h>
 
-#include <idlc/idlc.hxx>
-#include <idlc/errorhandler.hxx>
-#include <idlc/fehelper.hxx>
-#include <idlc/astexpression.hxx>
-#include <idlc/astconstants.hxx>
-#include <idlc/astconstant.hxx>
-#include <idlc/astbasetype.hxx>
-#include <idlc/asttypedef.hxx>
-#include <idlc/astexception.hxx>
-#include <idlc/astmember.hxx>
-#include <idlc/astenum.hxx>
-#include <idlc/astsequence.hxx>
-#include <idlc/astattribute.hxx>
-#include <idlc/astoperation.hxx>
-#include <idlc/astparameter.hxx>
-#include <idlc/astinterfacemember.hxx>
-#include <idlc/astservicemember.hxx>
-#include <idlc/astobserves.hxx>
-#include <idlc/astneeds.hxx>
-
-#include "idlc/aststructinstance.hxx"
+#include <idlc.hxx>
+#include <errorhandler.hxx>
+#include <fehelper.hxx>
+#include <astexpression.hxx>
+#include <astconstants.hxx>
+#include <astconstant.hxx>
+#include <astbasetype.hxx>
+#include <asttypedef.hxx>
+#include <astexception.hxx>
+#include <astmember.hxx>
+#include <astenum.hxx>
+#include <astsequence.hxx>
+#include <astattribute.hxx>
+#include <astoperation.hxx>
+#include <astparameter.hxx>
+#include <astinterfacemember.hxx>
+#include <astservicemember.hxx>
+#include <astobserves.hxx>
+#include <astneeds.hxx>
+
+#include "aststructinstance.hxx"
 
 #include "attributeexceptions.hxx"
 
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index 16ee27a93fe4..f1484bc0bab9 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -29,9 +29,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <idlc/idlc.hxx>
-#include <idlc/errorhandler.hxx>
-#include <idlc/fehelper.hxx>
+#include <idlc.hxx>
+#include <errorhandler.hxx>
+#include <fehelper.hxx>
 
 #include "attributeexceptions.hxx"