diff --git a/sax/source/fastparser/facreg.cxx b/sax/source/fastparser/facreg.cxx
index c3590b6ef3fd..b0b5848544b4 100644
--- a/sax/source/fastparser/facreg.cxx
+++ b/sax/source/fastparser/facreg.cxx
@@ -21,7 +21,6 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/implbase2.hxx>
 
-#include <fastserializer.hxx>
 #include "fastparser.hxx"
 
 using namespace sax_fastparser;
@@ -34,9 +33,6 @@ using namespace ::com::sun::star::lang;
 namespace sax_fastparser
 {
 
-//--------------------------------------
-// the extern interface
-//---------------------------------------
 Reference< XInterface > SAL_CALL FastSaxParser_CreateInstance(
     SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & )
     throw(Exception)
@@ -45,13 +41,6 @@ Reference< XInterface > SAL_CALL FastSaxParser_CreateInstance(
     return Reference< XInterface > ( (OWeakObject * ) p );
 }
 
-Reference< XInterface > SAL_CALL FastSaxSerializer_CreateInstance(
-    SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & )
-    throw(Exception)
-{
-    FastSaxSerializer *p = new FastSaxSerializer;
-    return Reference< XInterface > ( (OWeakObject * ) p );
-}
 }
 
 extern "C"
@@ -76,12 +65,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL fastsax_component_getFactory(
                                         FastSaxParser_CreateInstance,
                                         FastSaxParser::getSupportedServiceNames_Static() );
         }
-        else if ( aImplementationName == SERIALIZER_IMPLEMENTATION_NAME  )
-        {
-            xRet = createSingleFactory( xSMgr, aImplementationName,
-                                        FastSaxSerializer_CreateInstance,
-                                        FastSaxSerializer::getSupportedServiceNames_Static() );
-        }
 
         if (xRet.is())
         {
diff --git a/sax/source/fastparser/fastsax.component b/sax/source/fastparser/fastsax.component
index 4060c07d02cf..cc130e080160 100644
--- a/sax/source/fastparser/fastsax.component
+++ b/sax/source/fastparser/fastsax.component
@@ -22,7 +22,4 @@
   <implementation name="com.sun.star.comp.extensions.xml.sax.FastParser">
     <service name="com.sun.star.xml.sax.FastParser"/>
   </implementation>
-  <implementation name="com.sun.star.comp.extensions.xml.sax.FastSerializer">
-    <service name="com.sun.star.xml.sax.FastSerializer"/>
-  </implementation>
 </component>
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index ffdbaec63ff5..bd84747cb527 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <fastserializer.hxx>
+#include "fastserializer.hxx"
 #include <rtl/ustrbuf.hxx>
 
 #include <comphelper/sequenceasvector.hxx>
diff --git a/sax/inc/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
similarity index 98%
rename from sax/inc/fastserializer.hxx
rename to sax/source/tools/fastserializer.hxx
index 765cafb90dd2..13e047e5a373 100644
--- a/sax/inc/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -39,7 +39,7 @@
 
 namespace sax_fastparser {
 
-class SAX_DLLPUBLIC FastSaxSerializer : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::sax::XFastSerializer, ::com::sun::star::lang::XServiceInfo >
+class FastSaxSerializer : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::sax::XFastSerializer, ::com::sun::star::lang::XServiceInfo >
 {
     typedef ::com::sun::star::uno::Sequence< ::sal_Int8 > Int8Sequence;
     typedef ::com::sun::star::uno::Sequence< ::sal_Int32 > Int32Sequence;
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 8888fc791a89..ffb3506c175d 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <sax/fshelper.hxx>
-#include <fastserializer.hxx>
+#include "fastserializer.hxx"
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>