diff --git a/dom/media/mediasource/MediaSource.cpp b/dom/media/mediasource/MediaSource.cpp
index 22f746d4bf005..0ce7c4670b50f 100644
--- a/dom/media/mediasource/MediaSource.cpp
+++ b/dom/media/mediasource/MediaSource.cpp
@@ -37,6 +37,7 @@
 
 #ifdef MOZ_WIDGET_ANDROID
 #  include "AndroidBridge.h"
+#  include "mozilla/java/HardwareCodecCapabilityUtilsWrappers.h"
 #endif
 
 struct JSContext;
diff --git a/dom/media/platforms/android/AndroidDecoderModule.cpp b/dom/media/platforms/android/AndroidDecoderModule.cpp
index a12ccdd8570fe..30b93061818e6 100644
--- a/dom/media/platforms/android/AndroidDecoderModule.cpp
+++ b/dom/media/platforms/android/AndroidDecoderModule.cpp
@@ -2,7 +2,7 @@
  * 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/. */
 
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/HardwareCodecCapabilityUtilsWrappers.h"
 #include "MediaInfo.h"
 #include "OpusDecoder.h"
 #include "RemoteDataDecoder.h"
diff --git a/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/AnnotationProcessor.java b/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/AnnotationProcessor.java
index d02badf53ff00..d665b8228607a 100644
--- a/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/AnnotationProcessor.java
+++ b/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/AnnotationProcessor.java
@@ -98,7 +98,6 @@ public static void main(String[] args) {
         generatedNamesToUnify.add("GeckoVRManager");
         generatedNamesToUnify.add("GeckoVideoInfo");
         generatedNamesToUnify.add("GeckoWebExecutor");
-        generatedNamesToUnify.add("HardwareCodecCapabilityUtils");
         generatedNamesToUnify.add("ImageDecoder");
         generatedNamesToUnify.add("MediaDrmProxy");
         generatedNamesToUnify.add("PanZoomController");
diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
index 907e473501288..140f10182c8c2 100644
--- a/widget/android/AndroidBridge.cpp
+++ b/widget/android/AndroidBridge.cpp
@@ -44,6 +44,7 @@
 #include "WidgetUtils.h"
 
 #include "GeneratedJNIWrappers.h"
+#include "mozilla/java/HardwareCodecCapabilityUtilsWrappers.h"
 
 using namespace mozilla;
 using namespace mozilla::gfx;