diff --git a/FFmpegSource2/Makefile.am b/FFmpegSource2/Makefile.am
index 637506803..2d64770be 100644
--- a/FFmpegSource2/Makefile.am
+++ b/FFmpegSource2/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LIBRARIES = libffmpegsource2_aegisub.a
 
-AM_CPPFLAGS = -include ../aegisub/posix/defines.h -I../aegisub
+AM_CPPFLAGS = -include ../aegisub/posix/defines.h -I../aegisub @WX_CPPFLAGS@
 
 libffmpegsource2_aegisub_a_SOURCES = \
 	ffaudiosource.cpp \
diff --git a/configure.in b/configure.in
index 64bde6f01..8347eca16 100644
--- a/configure.in
+++ b/configure.in
@@ -870,8 +870,8 @@ if test "$have_wxconfig" != 1; then
 the libraries to your LDFLAGS, CXX/CFLAGS.])
 fi
 
-aegisub_save_CPPLAGS="$CPPLAGS"
-CPPFLAGS="$WX_CFLAGS"
+#aegisub_save_CPPFLAGS="$CPPFLAGS"
+#CPPFLAGS="$WX_CFLAGS"
 
 AC_ARG_ENABLE(check-wx-opengl, [--disable-check-wx-opengl
                         Force wxwidgets OpenGL support. ])