diff --git a/hal/android/AndroidHal.cpp b/hal/android/AndroidHal.cpp
index 098fc9db5035..77ecf6459387 100644
--- a/hal/android/AndroidHal.cpp
+++ b/hal/android/AndroidHal.cpp
@@ -8,6 +8,7 @@
 #include "WindowIdentifier.h"
 #include "AndroidBridge.h"
 #include "mozilla/dom/network/Constants.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
 #include "nsIScreenManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
diff --git a/hal/android/AndroidProcessPriority.cpp b/hal/android/AndroidProcessPriority.cpp
index 5ef342aa87d9..6b007106ceb8 100644
--- a/hal/android/AndroidProcessPriority.cpp
+++ b/hal/android/AndroidProcessPriority.cpp
@@ -6,7 +6,9 @@
 
 #include "Hal.h"
 
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/GeckoProcessManagerWrappers.h"
+#include "mozilla/java/GeckoProcessTypeWrappers.h"
+#include "mozilla/java/ServiceAllocatorWrappers.h"
 
 /**
  * Bucket the Gecko HAL process priority level into one of the three Android
diff --git a/hal/android/AndroidSensor.cpp b/hal/android/AndroidSensor.cpp
index 20cbed1b71fa..59db64a1d304 100644
--- a/hal/android/AndroidSensor.cpp
+++ b/hal/android/AndroidSensor.cpp
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Hal.h"
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
 
 using namespace mozilla::hal;