deleted file mode 100644
--- a/intl/locale/idl/moz.build
+++ /dev/null
@@ -1,15 +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 += [
-    'nsICollation.idl',
-    'nsILocale.idl',
-    'nsILocaleService.idl',
-    'nsIScriptableDateFormat.idl',
-]
-
-XPIDL_MODULE = 'locale'
-

--- a/intl/locale/moz.build
+++ b/intl/locale/moz.build
@@ -1,28 +1,43 @@
 # -*- 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', 'idl']
 TEST_DIRS += ['tests']
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
 if toolkit == 'windows':
     DIRS += ['windows']
 elif toolkit == 'cocoa':
     DIRS += ['mac']
 else:
     DIRS += ['unix']
 
+XPIDL_SOURCES += [
+    'nsICollation.idl',
+    'nsILocale.idl',
+    'nsILocaleService.idl',
+    'nsIScriptableDateFormat.idl',
+]
+
+XPIDL_MODULE = 'locale'
+
 EXPORTS += [
     'nsCollation.h',
+    'nsCollationCID.h',
+    'nsDateTimeFormatCID.h',
+    'nsIDateTimeFormat.h',
+    'nsILanguageAtomService.h',
+    'nsIPlatformCharset.h',
+    'nsPosixLocale.h',
+    'nsWin32Locale.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsCollation.cpp',
     'nsLanguageAtomService.cpp',
     'nsLocale.cpp',
     'nsLocaleService.cpp',
     'nsScriptableDateFormat.cpp',

rename from intl/locale/public/nsCollationCID.h
rename to intl/locale/nsCollationCID.h

rename from intl/locale/public/nsDateTimeFormatCID.h
rename to intl/locale/nsDateTimeFormatCID.h

rename from intl/locale/idl/nsICollation.idl
rename to intl/locale/nsICollation.idl

rename from intl/locale/public/nsIDateTimeFormat.h
rename to intl/locale/nsIDateTimeFormat.h

rename from intl/locale/public/nsILanguageAtomService.h
rename to intl/locale/nsILanguageAtomService.h

rename from intl/locale/idl/nsILocale.idl
rename to intl/locale/nsILocale.idl

rename from intl/locale/idl/nsILocaleService.idl
rename to intl/locale/nsILocaleService.idl

rename from intl/locale/public/nsIPlatformCharset.h
rename to intl/locale/nsIPlatformCharset.h

rename from intl/locale/idl/nsIScriptableDateFormat.idl
rename to intl/locale/nsIScriptableDateFormat.idl

rename from intl/locale/public/nsPosixLocale.h
rename to intl/locale/nsPosixLocale.h

rename from intl/locale/public/nsWin32Locale.h
rename to intl/locale/nsWin32Locale.h

deleted file mode 100644
--- a/intl/locale/public/moz.build
+++ /dev/null
@@ -1,16 +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 += [
-    'nsCollationCID.h',
-    'nsDateTimeFormatCID.h',
-    'nsIDateTimeFormat.h',
-    'nsILanguageAtomService.h',
-    'nsIPlatformCharset.h',
-    'nsPosixLocale.h',
-    'nsWin32Locale.h',
-]
-