--- a/parser/xml/moz.build
+++ b/parser/xml/moz.build
@@ -1,8 +1,38 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src']
 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'nsIMozSAXXMLDeclarationHandler.idl',
+    'nsISAXAttributes.idl',
+    'nsISAXContentHandler.idl',
+    'nsISAXDTDHandler.idl',
+    'nsISAXErrorHandler.idl',
+    'nsISAXLexicalHandler.idl',
+    'nsISAXLocator.idl',
+    'nsISAXMutableAttributes.idl',
+    'nsISAXXMLFilter.idl',
+    'nsISAXXMLReader.idl',
+]
+
+XPIDL_MODULE = 'saxparser'
+
+EXPORTS += [
+    'nsSAXAttributes.h',
+    'nsSAXLocator.h',
+    'nsSAXXMLReader.h',
+]
+
+SOURCES += [
+    'nsSAXAttributes.cpp',
+    'nsSAXLocator.cpp',
+    'nsSAXXMLReader.cpp',
+]
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'

rename from parser/xml/public/nsIMozSAXXMLDeclarationHandler.idl
rename to parser/xml/nsIMozSAXXMLDeclarationHandler.idl

rename from parser/xml/public/nsISAXAttributes.idl
rename to parser/xml/nsISAXAttributes.idl

rename from parser/xml/public/nsISAXContentHandler.idl
rename to parser/xml/nsISAXContentHandler.idl

rename from parser/xml/public/nsISAXDTDHandler.idl
rename to parser/xml/nsISAXDTDHandler.idl

rename from parser/xml/public/nsISAXErrorHandler.idl
rename to parser/xml/nsISAXErrorHandler.idl

rename from parser/xml/public/nsISAXLexicalHandler.idl
rename to parser/xml/nsISAXLexicalHandler.idl

rename from parser/xml/public/nsISAXLocator.idl
rename to parser/xml/nsISAXLocator.idl

rename from parser/xml/public/nsISAXMutableAttributes.idl
rename to parser/xml/nsISAXMutableAttributes.idl

rename from parser/xml/public/nsISAXXMLFilter.idl
rename to parser/xml/nsISAXXMLFilter.idl

rename from parser/xml/public/nsISAXXMLReader.idl
rename to parser/xml/nsISAXXMLReader.idl

rename from parser/xml/src/nsSAXAttributes.cpp
rename to parser/xml/nsSAXAttributes.cpp

rename from parser/xml/src/nsSAXAttributes.h
rename to parser/xml/nsSAXAttributes.h

rename from parser/xml/src/nsSAXLocator.cpp
rename to parser/xml/nsSAXLocator.cpp

rename from parser/xml/src/nsSAXLocator.h
rename to parser/xml/nsSAXLocator.h

rename from parser/xml/src/nsSAXXMLReader.cpp
rename to parser/xml/nsSAXXMLReader.cpp

rename from parser/xml/src/nsSAXXMLReader.h
rename to parser/xml/nsSAXXMLReader.h

deleted file mode 100644
--- a/parser/xml/public/moz.build
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIMozSAXXMLDeclarationHandler.idl',
-    'nsISAXAttributes.idl',
-    'nsISAXContentHandler.idl',
-    'nsISAXDTDHandler.idl',
-    'nsISAXErrorHandler.idl',
-    'nsISAXLexicalHandler.idl',
-    'nsISAXLocator.idl',
-    'nsISAXMutableAttributes.idl',
-    'nsISAXXMLFilter.idl',
-    'nsISAXXMLReader.idl',
-]
-
-XPIDL_MODULE = 'saxparser'
-

deleted file mode 100644
--- a/parser/xml/src/moz.build
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS += [
-    'nsSAXAttributes.h',
-    'nsSAXLocator.h',
-    'nsSAXXMLReader.h',
-]
-
-SOURCES += [
-    'nsSAXAttributes.cpp',
-    'nsSAXLocator.cpp',
-    'nsSAXXMLReader.cpp',
-]
-
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xul'