4 files changed, 22 insertions, 15 deletions
diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx
index 6ee6c3f5872f..b5fde5dfb13a 100644
--- a/include/xmlscript/xml_helper.hxx
+++ b/include/xmlscript/xml_helper.hxx
@@ -20,14 +20,15 @@
 #define INCLUDED_XMLSCRIPT_XML_HELPER_HXX
 
 #include <vector>
-#include <rtl/byteseq.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
 
 #include <xmlscript/xmlscriptdllapi.h>
 
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
+namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
+
 namespace xmlscript
 {
 
diff --git a/include/xmlscript/xmldlg_imexp.hxx b/include/xmlscript/xmldlg_imexp.hxx
index 34286a7f66b6..fcacfbf6d898 100644
--- a/include/xmlscript/xmldlg_imexp.hxx
+++ b/include/xmlscript/xmldlg_imexp.hxx
@@ -19,16 +19,18 @@
 #ifndef INCLUDED_XMLSCRIPT_XMLDLG_IMEXP_HXX
 #define INCLUDED_XMLSCRIPT_XMLDLG_IMEXP_HXX
 
-#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/io/XInputStreamProvider.hpp>
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include <xmlscript/xmlns.h>
 #include <xmlscript/xmlscriptdllapi.h>
 
+namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XInputStreamProvider; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XExtendedDocumentHandler; } } } } }
+
 namespace xmlscript
 {
 
diff --git a/include/xmlscript/xmllib_imexp.hxx b/include/xmlscript/xmllib_imexp.hxx
index 6bd49a47b23c..68eb292296c5 100644
--- a/include/xmlscript/xmllib_imexp.hxx
+++ b/include/xmlscript/xmllib_imexp.hxx
@@ -19,14 +19,15 @@
 #ifndef INCLUDED_XMLSCRIPT_XMLLIB_IMEXP_HXX
 #define INCLUDED_XMLSCRIPT_XMLLIB_IMEXP_HXX
 
-#include <com/sun/star/xml/sax/XWriter.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <xmlscript/xmlns.h>
 #include <xmlscript/xmlscriptdllapi.h>
 
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XWriter; } } } } }
+
 namespace xmlscript
 {
 
diff --git a/include/xmlscript/xmlmod_imexp.hxx b/include/xmlscript/xmlmod_imexp.hxx
index dd974cc712f6..df0c4cabae15 100644
--- a/include/xmlscript/xmlmod_imexp.hxx
+++ b/include/xmlscript/xmlmod_imexp.hxx
@@ -19,10 +19,13 @@
 #ifndef INCLUDED_XMLSCRIPT_XMLMOD_IMEXP_HXX
 #define INCLUDED_XMLSCRIPT_XMLMOD_IMEXP_HXX
 
-#include <com/sun/star/xml/sax/XWriter.hpp>
-#include <xmlscript/xmlns.h>
+#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ustring.hxx>
 #include <xmlscript/xmlscriptdllapi.h>
 
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XWriter; } } } } }
+
 namespace xmlscript
 {