21 files changed, 94 insertions, 94 deletions
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"