diff --git a/desmume/configure.ac b/desmume/configure.ac
index 244c7663c..73eaf6567 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -197,6 +197,8 @@ case $target in
     ;;
   *darwin*)
     LIBS="$LIBS -framework OpenGL"
+    dnl - extra hackery needed for X includes
+    AC_PATH_XTRA
     ;;
 esac
 
diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index d67309241..67a1d90f7 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/src/desmume.mk
 
-AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS)
+AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(X_CFLAGS)
 
 EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.cpp fs-windows.cpp \
 	matrix_sse2-x64.asm matrix_sse2-x86.asm