diff --git a/src/mod/languages/mod_java/Makefile.am b/src/mod/languages/mod_java/Makefile.am
index 1c9bda9fd3..b36675300f 100644
--- a/src/mod/languages/mod_java/Makefile.am
+++ b/src/mod/languages/mod_java/Makefile.am
@@ -4,11 +4,14 @@ MODNAME=mod_java
 mod_LTLIBRARIES = mod_java.la
 mod_java_la_SOURCES  = mod_java.cpp freeswitch_java.cpp switch_swig_wrap.cpp modjava.c
 mod_java_la_CFLAGS   = $(AM_CFLAGS)
+mod_java_la_CPPFLAGS = -I/usr/lib/jvm/java-gcj/include
+mod_java_la_CPPFLAGS+= -I/usr/lib/jvm/java-gcj/include/linux
+mod_java_la_CPPFLAGS+= $(AM_CPPFLAGS)
 mod_java_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_java_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
 # Without -fno-strict-aliasing, g++ generates invalid code for Java_org_freeswitch_freeswitchJNI_SWIGJavaSessionUpcast, which segfaults
-mod_java_la_CFLAGS  += $(JAVA_FLAGS) -fno-strict-aliasing -I/usr/lib/jvm/java-gcj/include -I/usr/lib/jvm/java-gcj/include/linux
+mod_java_la_CFLAGS  += $(JAVA_FLAGS) -fno-strict-aliasing
 
 CLASSES=src/org/freeswitch/Launcher.java \
 	src/org/freeswitch/HangupHook.java \