diff --git a/intl/locale/moz.build b/intl/locale/moz.build
index 9a03810c1f4b..25fa15fcc203 100644
--- a/intl/locale/moz.build
+++ b/intl/locale/moz.build
@@ -8,6 +8,9 @@ XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 if CONFIG['ENABLE_INTL_API']:
     SOURCES += ['OSPreferences.cpp']
+    EXPORTS.mozilla.intl += [
+        'OSPreferences.h',
+    ]
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
@@ -40,7 +43,7 @@ EXPORTS += [
 ]
 
 EXPORTS.mozilla.intl += [
-    'LocaleService.h'
+    'LocaleService.h',
 ]
 
 UNIFIED_SOURCES += [
diff --git a/intl/locale/tests/gtest/TestLocaleService.cpp b/intl/locale/tests/gtest/TestLocaleService.cpp
index 33c2f3187581..7d6af36bc5ae 100644
--- a/intl/locale/tests/gtest/TestLocaleService.cpp
+++ b/intl/locale/tests/gtest/TestLocaleService.cpp
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "gtest/gtest.h"
-#include "LocaleService.h"
+#include "mozilla/intl/LocaleService.h"
 #include "mozilla/Services.h"
 #include "nsIToolkitChromeRegistry.h"
 
diff --git a/intl/locale/tests/gtest/TestOSPreferences.cpp b/intl/locale/tests/gtest/TestOSPreferences.cpp
index cd03cb6f8d6f..71d8f95069bd 100644
--- a/intl/locale/tests/gtest/TestOSPreferences.cpp
+++ b/intl/locale/tests/gtest/TestOSPreferences.cpp
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "gtest/gtest.h"
-#include "OSPreferences.h"
+#include "mozilla/intl/OSPreferences.h"
 
 using namespace mozilla::intl;
 
diff --git a/intl/locale/tests/gtest/moz.build b/intl/locale/tests/gtest/moz.build
index 8254c59ddaa4..69bde4c1d12a 100644
--- a/intl/locale/tests/gtest/moz.build
+++ b/intl/locale/tests/gtest/moz.build
@@ -14,8 +14,4 @@ if CONFIG['ENABLE_INTL_API']:
         'TestOSPreferences.cpp',
     ]
 
-LOCAL_INCLUDES += [
-    '/intl/locale',
-]
-
 FINAL_LIBRARY = 'xul-gtest'