gbuildification of sax

Change-Id: I6e8220e88566e04b20687d54181205d31ec68e13

7 files changed, 3 insertions, 8 deletions

diff --git a/sax/inc/sax/fastattribs.hxx b/sax/inc/sax/fastattribs.hxx
index 6759b58c1c74..1db74e12cc0d 100644
--- a/sax/inc/sax/fastattribs.hxx
+++ b/sax/inc/sax/fastattribs.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/xml/FastAttribute.hpp>
 
 #include <cppuhelper/implbase1.hxx>
-#include "sax/dllapi.h"
+#include "sax/saxdllapi.h"
 
 #include <map>
 #include <vector>
diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx
index 73d04eb9560c..9278081ebe4f 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/sax/inc/sax/fshelper.hxx
@@ -35,7 +35,6 @@
 #include <stdarg.h>
 #include <boost/shared_ptr.hpp>
 #include <sax/fastattribs.hxx>
-#include "sax/dllapi.h"
 
 #define FSNS(namespc, element) ((namespc << 16) | element)
 const sal_Int32 FSEND = -1; // same as XML_TOKEN_INVALID
diff --git a/sax/inc/sax/parser/saxparser.hxx b/sax/inc/sax/parser/saxparser.hxx
index 16bd1a3446e3..d8235dfebd40 100644
--- a/sax/inc/sax/parser/saxparser.hxx
+++ b/sax/inc/sax/parser/saxparser.hxx
@@ -29,7 +29,6 @@
 #ifndef _SAX_SAXPARSER_HXX_
 #define _SAX_SAXPARSER_HXX_
 
-#include "sax/dllapi.h"
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <rtl/ref.hxx>
diff --git a/sax/inc/sax/dllapi.h b/sax/inc/sax/saxdllapi.h
index 1e4904718776..7602424c1fdf 100644
--- a/sax/inc/sax/dllapi.h
+++ b/sax/inc/sax/saxdllapi.h
@@ -29,7 +29,7 @@
 #ifndef INCLUDED_SAX_DLLAPI_H
 #define INCLUDED_SAX_DLLAPI_H
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #if defined SAX_DLLIMPLEMENTATION
 #define SAX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
diff --git a/sax/inc/sax/tools/attributemap.hxx b/sax/inc/sax/tools/attributemap.hxx
index 7a867c932a9d..579356ea8c5a 100644
--- a/sax/inc/sax/tools/attributemap.hxx
+++ b/sax/inc/sax/tools/attributemap.hxx
@@ -29,8 +29,6 @@
 #ifndef _SAX_ATTRIBUTEMAP_HXX_
 #define _SAX_ATTRIBUTEMAP_HXX_
 
-#include "sax/dllapi.h"
-
 #include <map>
 #include "sax/tools/tokenmap.hxx"
 
diff --git a/sax/inc/sax/tools/saxobject.hxx b/sax/inc/sax/tools/saxobject.hxx
index ee72ceeac983..4a1fba477bc9 100644
--- a/sax/inc/sax/tools/saxobject.hxx
+++ b/sax/inc/sax/tools/saxobject.hxx
@@ -30,7 +30,7 @@
 #define _SAX_OBJECT_HXX_
 
 #include <sal/types.h>
-#include "sax/dllapi.h"
+#include "sax/saxdllapi.h"
 
 namespace sax
 {
diff --git a/sax/inc/sax/tools/tokenmap.hxx b/sax/inc/sax/tools/tokenmap.hxx
index 8749a6587b1c..71704f092a09 100644
--- a/sax/inc/sax/tools/tokenmap.hxx
+++ b/sax/inc/sax/tools/tokenmap.hxx
@@ -31,7 +31,6 @@
 
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include "sax/dllapi.h"
 #include "sax/tools/saxobject.hxx"
 
 namespace sax