diff --git a/java/plugins/jni/Makefile.in b/java/plugins/jni/Makefile.in
index 0c0f90c8c0f..f866bf7f79e 100644
--- a/java/plugins/jni/Makefile.in
+++ b/java/plugins/jni/Makefile.in
@@ -45,10 +45,12 @@ CPPSRCS =  \
 	org_mozilla_util_DebugPluglet.cpp \
 	$(NULL)
 
-INCLUDES += -I$(MOZILLA_FIVE_HOME)/../include/xpcom \
-	-I$(MOZILLA_FIVE_HOME)/../include/plugin \
-	-I$(MOZILLA_FIVE_HOME)/../include/string \
-	-I$(MOZILLA_FIVE_HOME)/../include/xpcom_obsolete \
+INCLUDES += \
+	-I$(DIST)/include/string \
+	-I$(DIST)/include/plugin \
+	-I$(DIST)/include/xpcom \
+	-I$(DIST)/include/xpcom_obsolete \
+	$(NULL)
 
 EXTRA_LIBS     += \
 		$(NSPR_LIBS) \
diff --git a/java/plugins/mozilla/Makefile.in b/java/plugins/mozilla/Makefile.in
index 6922d229426..04eac95d946 100644
--- a/java/plugins/mozilla/Makefile.in
+++ b/java/plugins/mozilla/Makefile.in
@@ -77,11 +77,17 @@ INCLUDES += \
 	-I$(MSVCDIR)/ATL/SRC \
 	-I$(DEPTH)/../java/plugins/src \
 	-I../src/_xpidlgen \
-	-I$(MOZILLA_FIVE_HOME)/../include/string \
-	-I$(MOZILLA_FIVE_HOME)/../include/xpcom_obsolete \
 	$(NULL)
 endif
 
+INCLUDES += \
+	-I$(DIST)/include/string \
+	-I$(DIST)/include/plugin \
+	-I$(DIST)/include/xpcom \
+	-I$(DIST)/include/xpcom_obsolete \
+	$(NULL)
+
+
 CXXFLAGS += -DFORCE_PR_LOG
 
 DEFINES += -DMOZILLA_STRICT_API
diff --git a/java/plugins/src/Makefile.in b/java/plugins/src/Makefile.in
index 58dde0683ad..840cc51ac2c 100644
--- a/java/plugins/src/Makefile.in
+++ b/java/plugins/src/Makefile.in
@@ -93,10 +93,12 @@ ifeq ($(OS_ARCH),Darwin)
  DLL_SUFFIX = .jnilib
 endif #DARWIN
 
-INCLUDES += -I$(MOZILLA_FIVE_HOME)/../include/xpcom \
-	-I$(MOZILLA_FIVE_HOME)/../include/plugin \
-	-I$(MOZILLA_FIVE_HOME)/../include/string \
-	-I$(MOZILLA_FIVE_HOME)/../include/xpcom_obsolete \
+INCLUDES += \
+	-I$(DIST)/include/string \
+	-I$(DIST)/include/plugin \
+	-I$(DIST)/include/xpcom \
+	-I$(DIST)/include/xpcom_obsolete \
+	$(NULL)
 
 ifeq ($(OS_ARCH),Linux)
 DSO_LDOPTS	+= \