diff --git a/dom/media/CubebUtils.cpp b/dom/media/CubebUtils.cpp
index 509eab885346..a18f603167fa 100644
--- a/dom/media/CubebUtils.cpp
+++ b/dom/media/CubebUtils.cpp
@@ -30,7 +30,7 @@
 #include <algorithm>
 #include <stdint.h>
 #ifdef MOZ_WIDGET_ANDROID
-#  include "GeneratedJNIWrappers.h"
+#  include "mozilla/java/GeckoAppShellWrappers.h"
 #endif
 #ifdef XP_WIN
 #  include "mozilla/mscom/EnsureMTA.h"
diff --git a/dom/media/eme/MediaKeySystemAccess.cpp b/dom/media/eme/MediaKeySystemAccess.cpp
index f075c5282751..e3eab24ee026 100644
--- a/dom/media/eme/MediaKeySystemAccess.cpp
+++ b/dom/media/eme/MediaKeySystemAccess.cpp
@@ -33,7 +33,7 @@
 #endif
 #ifdef MOZ_WIDGET_ANDROID
 #  include "AndroidDecoderModule.h"
-#  include "GeneratedJNIWrappers.h"
+#  include "mozilla/java/MediaDrmProxyWrappers.h"
 #endif
 
 namespace mozilla {
diff --git a/dom/media/eme/mediadrm/MediaDrmCDMProxy.h b/dom/media/eme/mediadrm/MediaDrmCDMProxy.h
index 5ee27b28c4c5..0e30f58906f7 100644
--- a/dom/media/eme/mediadrm/MediaDrmCDMProxy.h
+++ b/dom/media/eme/mediadrm/MediaDrmCDMProxy.h
@@ -9,7 +9,6 @@
 
 #include <jni.h>
 #include "mozilla/jni/Types.h"
-#include "GeneratedJNINatives.h"
 #include "mozilla/CDMProxy.h"
 #include "mozilla/CDMCaps.h"
 #include "mozilla/dom/MediaKeys.h"
diff --git a/dom/media/eme/mediadrm/MediaDrmProxySupport.cpp b/dom/media/eme/mediadrm/MediaDrmProxySupport.cpp
index c432b0fd3904..39e0fea3d7b5 100644
--- a/dom/media/eme/mediadrm/MediaDrmProxySupport.cpp
+++ b/dom/media/eme/mediadrm/MediaDrmProxySupport.cpp
@@ -6,7 +6,8 @@
 
 #include "MediaDrmProxySupport.h"
 #include "mozilla/EMEUtils.h"
-#include "GeneratedJNINatives.h"
+#include "mozilla/java/MediaDrmProxyNatives.h"
+#include "mozilla/java/SessionKeyInfoWrappers.h"
 #include "MediaCodec.h"  // For MediaDrm::KeyStatus
 
 namespace mozilla {
diff --git a/dom/media/eme/mediadrm/MediaDrmProxySupport.h b/dom/media/eme/mediadrm/MediaDrmProxySupport.h
index e699034a2924..5640189008b9 100644
--- a/dom/media/eme/mediadrm/MediaDrmProxySupport.h
+++ b/dom/media/eme/mediadrm/MediaDrmProxySupport.h
@@ -8,8 +8,8 @@
 #define MediaDrmProxySupport_H
 
 #include "mozilla/DecryptorProxyCallback.h"
+#include "mozilla/java/MediaDrmProxyWrappers.h"
 #include "mozilla/Logging.h"
-#include "GeneratedJNIWrappers.h"
 #include "nsString.h"
 
 namespace mozilla {
diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
index 7003ae69c431..f19cb58ebc04 100644
--- a/dom/media/gmp/GMPParent.cpp
+++ b/dom/media/gmp/GMPParent.cpp
@@ -33,6 +33,10 @@
 #ifdef XP_WIN
 #  include "WMFDecoderModule.h"
 #endif
+#if defined(MOZ_WIDGET_ANDROID)
+#  include "mozilla/java/GeckoProcessManagerWrappers.h"
+#  include "mozilla/java/GeckoProcessTypeWrappers.h"
+#endif  // defined(MOZ_WIDGET_ANDROID)
 
 using mozilla::ipc::GeckoChildProcessHost;
 
diff --git a/dom/media/hls/HLSDecoder.cpp b/dom/media/hls/HLSDecoder.cpp
index c90b9118c64e..973ad63c4bf2 100644
--- a/dom/media/hls/HLSDecoder.cpp
+++ b/dom/media/hls/HLSDecoder.cpp
@@ -7,14 +7,13 @@
 #include "HLSDecoder.h"
 #include "AndroidBridge.h"
 #include "DecoderTraits.h"
-#include "GeneratedJNINatives.h"
-#include "GeneratedJNIWrappers.h"
 #include "HLSDemuxer.h"
 #include "HLSUtils.h"
 #include "MediaContainerType.h"
 #include "MediaDecoderStateMachine.h"
 #include "MediaFormatReader.h"
 #include "MediaShutdownManager.h"
+#include "mozilla/java/GeckoHLSResourceWrapperNatives.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 #include "nsThreadUtils.h"
diff --git a/dom/media/hls/HLSDecoder.h b/dom/media/hls/HLSDecoder.h
index 4eb9dab30e77..c334b76ffcdc 100644
--- a/dom/media/hls/HLSDecoder.h
+++ b/dom/media/hls/HLSDecoder.h
@@ -8,7 +8,7 @@
 #define HLSDecoder_h_
 
 #include "MediaDecoder.h"
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/GeckoHLSResourceWrapperWrappers.h"
 
 namespace mozilla {
 
diff --git a/dom/media/hls/HLSDemuxer.cpp b/dom/media/hls/HLSDemuxer.cpp
index 798bfc1e52a7..6d59a8b2c370 100644
--- a/dom/media/hls/HLSDemuxer.cpp
+++ b/dom/media/hls/HLSDemuxer.cpp
@@ -12,6 +12,9 @@
 
 #include "HLSUtils.h"
 #include "MediaCodec.h"
+#include "mozilla/java/GeckoAudioInfoWrappers.h"
+#include "mozilla/java/GeckoHLSDemuxerWrapperNatives.h"
+#include "mozilla/java/GeckoVideoInfoWrappers.h"
 #include "mozilla/Unused.h"
 #include "nsPrintfCString.h"
 
diff --git a/dom/media/hls/HLSDemuxer.h b/dom/media/hls/HLSDemuxer.h
index 7cba38fc6458..4813eaafb2be 100644
--- a/dom/media/hls/HLSDemuxer.h
+++ b/dom/media/hls/HLSDemuxer.h
@@ -7,12 +7,12 @@
 #if !defined(HLSDemuxer_h_)
 #  define HLSDemuxer_h_
 
-#  include "GeneratedJNINatives.h"
-#  include "GeneratedJNIWrappers.h"
 #  include "MediaCodec.h"
 #  include "MediaDataDemuxer.h"
 #  include "MediaDecoder.h"
 #  include "mozilla/Atomics.h"
+#  include "mozilla/java/GeckoHLSDemuxerWrapperWrappers.h"
+#  include "mozilla/java/GeckoHLSSampleWrappers.h"
 #  include "mozilla/Maybe.h"
 #  include "mozilla/Mutex.h"
 #  include "mozilla/TaskQueue.h"
diff --git a/dom/media/platforms/android/AndroidDataEncoder.h b/dom/media/platforms/android/AndroidDataEncoder.h
index 61909842aea7..cacd779cdce0 100644
--- a/dom/media/platforms/android/AndroidDataEncoder.h
+++ b/dom/media/platforms/android/AndroidDataEncoder.h
@@ -9,7 +9,6 @@
 #include "PlatformEncoderModule.h"
 #include "TimeUnits.h"
 
-#include "GeneratedJNIWrappers.h"
 #include "JavaCallbacksSupport.h"
 
 #include "mozilla/Maybe.h"
diff --git a/dom/media/platforms/android/JavaCallbacksSupport.h b/dom/media/platforms/android/JavaCallbacksSupport.h
index 82fd50a862bb..e79d7962092f 100644
--- a/dom/media/platforms/android/JavaCallbacksSupport.h
+++ b/dom/media/platforms/android/JavaCallbacksSupport.h
@@ -5,9 +5,11 @@
 #ifndef JavaCallbacksSupport_h_
 #define JavaCallbacksSupport_h_
 
-#include "GeneratedJNINatives.h"
 #include "MediaResult.h"
 #include "MediaCodec.h"
+#include "mozilla/java/CodecProxyNatives.h"
+#include "mozilla/java/SampleBufferWrappers.h"
+#include "mozilla/java/SampleWrappers.h"
 
 namespace mozilla {
 
diff --git a/dom/media/platforms/android/RemoteDataDecoder.cpp b/dom/media/platforms/android/RemoteDataDecoder.cpp
index 7f41d5a59b29..7c08080e263d 100644
--- a/dom/media/platforms/android/RemoteDataDecoder.cpp
+++ b/dom/media/platforms/android/RemoteDataDecoder.cpp
@@ -11,6 +11,11 @@
 #include "JavaCallbacksSupport.h"
 #include "MediaData.h"
 #include "MediaInfo.h"
+#include "mozilla/java/CodecProxyWrappers.h"
+#include "mozilla/java/GeckoSurfaceWrappers.h"
+#include "mozilla/java/SampleWrappers.h"
+#include "mozilla/java/SampleBufferWrappers.h"
+#include "mozilla/java/SurfaceAllocatorWrappers.h"
 #include "SimpleMap.h"
 #include "VideoUtils.h"
 #include "VPXDecoder.h"
diff --git a/dom/media/platforms/android/RemoteDataDecoder.h b/dom/media/platforms/android/RemoteDataDecoder.h
index 1fb52769831d..81bed4c552e0 100644
--- a/dom/media/platforms/android/RemoteDataDecoder.h
+++ b/dom/media/platforms/android/RemoteDataDecoder.h
@@ -6,9 +6,9 @@
 #define RemoteDataDecoder_h_
 
 #include "AndroidDecoderModule.h"
-#include "GeneratedJNIWrappers.h"
 #include "SurfaceTexture.h"
 #include "TimeUnits.h"
+#include "mozilla/java/CodecProxyWrappers.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Monitor.h"
 
diff --git a/dom/media/webspeech/synth/android/SpeechSynthesisService.h b/dom/media/webspeech/synth/android/SpeechSynthesisService.h
index cc31e9605bfc..98c5143cf690 100644
--- a/dom/media/webspeech/synth/android/SpeechSynthesisService.h
+++ b/dom/media/webspeech/synth/android/SpeechSynthesisService.h
@@ -7,8 +7,8 @@
 #ifndef mozilla_dom_SpeechSynthesisService_h
 #define mozilla_dom_SpeechSynthesisService_h
 
-#include "GeneratedJNINatives.h"
 #include "nsISpeechService.h"
+#include "mozilla/java/SpeechSynthesisServiceNatives.h"
 #include "mozilla/StaticPtr.h"
 
 namespace mozilla {