--- a/widget/android/GeneratedJNINatives.h
+++ b/widget/android/GeneratedJNINatives.h
@@ -2,18 +2,20 @@
 // Generated by the Java program at /build/annotationProcessors at compile time
 // from annotations on Java methods. To update, change the annotations on the
 // corresponding Java methods and rerun the build. Manually updating this file
 // will cause your build to fail.
 
 #ifndef GeneratedJNINatives_h
 #define GeneratedJNINatives_h
 
+#ifndef MOZ_PREPROCESSOR
 #include "GeneratedJNIWrappers.h"
 #include "mozilla/jni/Natives.h"
+#endif
 
 namespace mozilla {
 namespace java {
 
 template<class Impl>
 class AndroidGamepadManager::Natives : public mozilla::jni::NativeImpl<AndroidGamepadManager, Impl>
 {
 public:

--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -1,16 +1,18 @@
 // GENERATED CODE
 // Generated by the Java program at /build/annotationProcessors at compile time
 // from annotations on Java methods. To update, change the annotations on the
 // corresponding Java methods and rerun the build. Manually updating this file
 // will cause your build to fail.
 
+#ifndef MOZ_PREPROCESSOR
 #include "GeneratedJNIWrappers.h"
 #include "mozilla/jni/Accessors.h"
+#endif
 
 namespace mozilla {
 namespace java {
 
 const char AndroidGamepadManager::name[] =
         "org/mozilla/gecko/AndroidGamepadManager";
 
 constexpr char AndroidGamepadManager::OnAxisChange_t::name[];

--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -2,17 +2,19 @@
 // Generated by the Java program at /build/annotationProcessors at compile time
 // from annotations on Java methods. To update, change the annotations on the
 // corresponding Java methods and rerun the build. Manually updating this file
 // will cause your build to fail.
 
 #ifndef GeneratedJNIWrappers_h
 #define GeneratedJNIWrappers_h
 
+#ifndef MOZ_PREPROCESSOR
 #include "mozilla/jni/Refs.h"
+#endif
 
 namespace mozilla {
 namespace java {
 
 class AndroidGamepadManager : public mozilla::jni::ObjectBase<AndroidGamepadManager>
 {
 public:
     static const char name[];

--- a/widget/android/fennec/FennecJNINatives.h
+++ b/widget/android/fennec/FennecJNINatives.h
@@ -2,18 +2,20 @@
 // Generated by the Java program at /build/annotationProcessors at compile time
 // from annotations on Java methods. To update, change the annotations on the
 // corresponding Java methods and rerun the build. Manually updating this file
 // will cause your build to fail.
 
 #ifndef FennecJNINatives_h
 #define FennecJNINatives_h
 
+#ifndef MOZ_PREPROCESSOR
 #include "FennecJNIWrappers.h"
 #include "mozilla/jni/Natives.h"
+#endif
 
 namespace mozilla {
 namespace java {
 
 template<class Impl>
 class ANRReporter::Natives : public mozilla::jni::NativeImpl<ANRReporter, Impl>
 {
 public:

--- a/widget/android/fennec/FennecJNIWrappers.cpp
+++ b/widget/android/fennec/FennecJNIWrappers.cpp
@@ -1,16 +1,18 @@
 // GENERATED CODE
 // Generated by the Java program at /build/annotationProcessors at compile time
 // from annotations on Java methods. To update, change the annotations on the
 // corresponding Java methods and rerun the build. Manually updating this file
 // will cause your build to fail.
 
+#ifndef MOZ_PREPROCESSOR
 #include "FennecJNIWrappers.h"
 #include "mozilla/jni/Accessors.h"
+#endif
 
 namespace mozilla {
 namespace java {
 
 const char ANRReporter::name[] =
         "org/mozilla/gecko/ANRReporter";
 
 constexpr char ANRReporter::GetNativeStack_t::name[];

--- a/widget/android/fennec/FennecJNIWrappers.h
+++ b/widget/android/fennec/FennecJNIWrappers.h
@@ -2,17 +2,19 @@
 // Generated by the Java program at /build/annotationProcessors at compile time
 // from annotations on Java methods. To update, change the annotations on the
 // corresponding Java methods and rerun the build. Manually updating this file
 // will cause your build to fail.
 
 #ifndef FennecJNIWrappers_h
 #define FennecJNIWrappers_h
 
+#ifndef MOZ_PREPROCESSOR
 #include "mozilla/jni/Refs.h"
+#endif
 
 namespace mozilla {
 namespace java {
 
 class ANRReporter : public mozilla::jni::ObjectBase<ANRReporter>
 {
 public:
     static const char name[];