7 files changed, 20 insertions, 4 deletions
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 7170dc008e49..d0fc36c842e0 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/d
 
 $(eval $(call gb_Library_set_include,dbtools,\
 	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
diff --git a/connectivity/source/simpledbt/charset_s.hxx b/connectivity/inc/simpledbt/charset_s.hxx
index 25aa2bfc7630..25aa2bfc7630 100644
--- a/connectivity/source/simpledbt/charset_s.hxx
+++ b/connectivity/inc/simpledbt/charset_s.hxx
diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/inc/simpledbt/parser_s.hxx
index 359ab25c6366..359ab25c6366 100644
--- a/connectivity/source/simpledbt/parser_s.hxx
+++ b/connectivity/inc/simpledbt/parser_s.hxx
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 4f5e3950a573..557e4286a1a7 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -82,6 +82,9 @@
 #include "resource/sharedresources.hxx"
 #include <connectivity/OSubComponent.hxx>
 
+#include "simpledbt/parser_s.hxx"
+#include "simpledbt/charset_s.hxx"
+
 #include <algorithm>
 #include <iterator>
 #include <set>
@@ -1973,6 +1976,18 @@ void getBooleanComparisonPredicate( const OUString& _rExpression, const bool _bV
     }
 }
 
+simple::ISQLParser* createSQLParser(
+    const Reference< XComponentContext >& rxContext,
+    const IParseContext* _pContext )
+{
+    return new OSimpleSQLParser(rxContext, _pContext);
+}
+
+simple::IDataAccessCharSet* createCharsetHelper( )
+{
+    return new ODataAccessCharSet;
+}
+
 }   // namespace dbtools
 
 namespace connectivity
diff --git a/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx
index 2843b674e6f9..261a46a59c8f 100644
--- a/connectivity/source/simpledbt/charset_s.cxx
+++ b/connectivity/source/simpledbt/charset_s.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "charset_s.hxx"
+#include "simpledbt/charset_s.hxx"
 
 
 namespace connectivity
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index cead9fab7fe8..85fca69453e7 100644
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
@@ -20,10 +20,10 @@
 
 #include <connectivity/virtualdbtools.hxx>
 #include <connectivity/formattedcolumnvalue.hxx>
+#include "simpledbt/parser_s.hxx"
+#include "simpledbt/charset_s.hxx"
 #include "dbtfactory.hxx"
-#include "parser_s.hxx"
 #include "staticdbtools_s.hxx"
-#include "charset_s.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx
index eddae295e7cb..e9194af045bf 100644
--- a/connectivity/source/simpledbt/parser_s.cxx
+++ b/connectivity/source/simpledbt/parser_s.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <connectivity/virtualdbtools.hxx>
-#include "parser_s.hxx"
+#include "simpledbt/parser_s.hxx"
 #include "parsenode_s.hxx"
 
 using namespace ::com::sun::star::uno;