7 files changed, 10 insertions, 11 deletions
diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx
index 57d28b4fb9c0..19caebb8cf0e 100644
--- a/connectivity/source/parse/internalnode.cxx
+++ b/connectivity/source/parse/internalnode.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internalnode.hxx"
-
 #include <algorithm>
+
 #include <connectivity/sqlparse.hxx>
+#include <connectivity/internalnode.hxx>
 
 using namespace connectivity;
 
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index d5bc6fb5ff3c..0b661e92ae22 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -21,11 +21,12 @@
 
 #include <vector>
 #include <string.h>
-#include "parse/sqlbison_exports.hxx"
 
 #include <connectivity/sqlnode.hxx>
 #include <connectivity/sqlparse.hxx>
-#include <internalnode.hxx>
+#include <connectivity/sqlbison_exports.hxx>
+#include <connectivity/sqlscan.hxx>
+#include <connectivity/internalnode.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/util/Date.hpp>
@@ -40,7 +41,6 @@
 #include <com/sun/star/i18n/KParseType.hpp>
 #include <com/sun/star/i18n/KParseTokens.hpp>
 
-#include "sqlscan.hxx"
 #include <osl/diagnose.h>
 #include "connectivity/dbconversion.hxx"
 #include <rtl/ustrbuf.hxx>
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 47a42ec3ea87..e3629d7b7941 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -28,7 +28,7 @@
 
 #include <string.h>
 
-#include "internalnode.hxx"
+#include <connectivity/internalnode.hxx>
 
 #ifndef _CONNECTIVITY_SQLYACC_HXX
 #define _CONNECTIVITY_SQLYACC_HXX
@@ -41,10 +41,10 @@
 #undef SQLyylex
 #undef SQLyyerror
 #endif
-#include "sqlscan.hxx"
 #include <osl/diagnose.h>
 #include <rtl/strbuf.hxx>
 #include <connectivity/sqlparse.hxx>
+#include <connectivity/sqlscan.hxx>
 
 #if defined __SUNPRO_CC
 #pragma disable_warn
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 787b1fa08c21..1c748abae7b2 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "parse/sqlbison_exports.hxx"
-
 #include <sal/macros.h>
 #include <connectivity/sqlnode.hxx>
 #include <connectivity/sqlerror.hxx>
-#include <internalnode.hxx>
+#include <connectivity/sqlbison_exports.hxx>
+#include <connectivity/internalnode.hxx>
 #define YYBISON   1
 #include <sqlbison.hxx>
 #include <connectivity/sqlparse.hxx>
+#include <connectivity/sqlscan.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
@@ -47,7 +47,6 @@
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include "TConnection.hxx"
-#include "sqlscan.hxx"
 #include <comphelper/numbers.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/stl_types.hxx>
diff --git a/connectivity/source/inc/internalnode.hxx b/include/connectivity/internalnode.hxx
index be605e23761c..be605e23761c 100644
--- a/connectivity/source/inc/internalnode.hxx
+++ b/include/connectivity/internalnode.hxx
diff --git a/connectivity/source/inc/parse/sqlbison_exports.hxx b/include/connectivity/sqlbison_exports.hxx
index 38fa786402ea..38fa786402ea 100644
--- a/connectivity/source/inc/parse/sqlbison_exports.hxx
+++ b/include/connectivity/sqlbison_exports.hxx
diff --git a/connectivity/source/inc/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index dd0aa463fb3b..dd0aa463fb3b 100644
--- a/connectivity/source/inc/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx