diff --git a/configure.in b/configure.in
index 59916f86284..6a0b2e4cab4 100644
--- a/configure.in
+++ b/configure.in
@@ -5524,6 +5524,15 @@ if test -n "$MOZ_ANDROID_HISTORY"; then
      AC_DEFINE(MOZ_ANDROID_HISTORY)
 fi
 
+
+dnl ========================================================
+dnl = Build with the Android Java compositor
+dnl ========================================================
+if test -n "$MOZ_JAVA_COMPOSITOR"; then
+     dnl Do this if defined in confvars.sh
+     AC_DEFINE(MOZ_JAVA_COMPOSITOR)
+fi
+
 dnl ========================================================
 dnl = Disable WebSMS backend
 dnl ========================================================
diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in
index d91f793ed68..f4516501232 100644
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -132,10 +132,6 @@ endif
 endif
 endif
 
-ifdef MOZ_JAVA_COMPOSITOR
-DEFINES += -DMOZ_JAVA_COMPOSITOR
-endif
-
 LOCAL_INCLUDES += \
   -DSK_BUILD_FOR_ANDROID_NDK \
   -I$(topsrcdir)/widget/android \
diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in
index 236837b8e20..2871317cb1d 100644
--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -51,10 +51,6 @@ MODULE_NAME     = nsWidgetAndroidModule
 GRE_MODULE      = 1
 LIBXUL_LIBRARY  = 1
 
-ifdef MOZ_JAVA_COMPOSITOR
-DEFINES += -DMOZ_JAVA_COMPOSITOR
-endif
-
 ifdef MOZ_ONLY_TOUCH_EVENTS
 DEFINES += -DMOZ_ONLY_TOUCH_EVENTS
 endif