diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am
index 61a3d927c..10276c114 100644
--- a/aegisub/Makefile.am
+++ b/aegisub/Makefile.am
@@ -1,13 +1,14 @@
 AUTOMAKE_OPTIONS = foreign
 SUFFIXES = .c .cpp .rc
+noinst_LIBRARIES= 
 
 SUBDIRS = bitmaps posix
 
-bin_PROGRAMS = aegisub
-noinst_LIBRARIES= 
+AM_CPPFLAGS = -DAEGISUB -Iposix -include posix/defines.h @WX_CPPFLAGS@
 
-AM_CPPFLAGS = -DAEGISUB -Iposix -include posix/defines.h @FREETYPE_CFLAGS@ @WX_CPPFLAGS@
+bin_PROGRAMS = aegisub
 aegisub_LDADD = posix/libposix.a
+aegisub_CPPFLAGS = @FREETYPE_CFLAGS@ -DAEGISUB -Iposix -include posix/defines.h @WX_CPPFLAGS@
 aegisub_LDFLAGS = @GL_LIBS@ @FREETYPE_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@
 
 #XXX: fix this so it's generated by configure and put into acconf.h
@@ -31,7 +32,7 @@ endif
 if HAVE_PULSEAUDIO
 noinst_LIBRARIES += libaudio_pulseaudio.a
 libaudio_pulseaudio_a_SOURCES = audio_player_pulse.cpp
-libaudio_pulseaudio_a_CFLAGS = @LIBPULSE_CFLAGS@
+libaudio_pulseaudio_a_CPPFLAGS = @LIBPULSE_CFLAGS@
 aegisub_LDFLAGS += @LIBPULSE_LIBS@
 aegisub_LDADD += libaudio_pulseaudio.a
 endif
@@ -39,7 +40,7 @@ endif
 if HAVE_OPENAL
 noinst_LIBRARIES += libaudio_openal.a
 libaudio_openal_a_SOURCES = audio_player_openal.cpp
-libaudio_openal_a_CFLAGS = @OPENAL_CFLAGS@
+libaudio_openal_a_CPPFLAGS = @OPENAL_CFLAGS@
 aegisub_LDFLAGS += @OPENAL_LIBS@
 aegisub_LDADD += libaudio_openal.a
 endif
@@ -47,7 +48,6 @@ endif
 if HAVE_FFMPEG
 noinst_LIBRARIES += libaudiovideo_ffmpeg.a
 libaudiovideo_ffmpeg_a_SOURCES = audio_provider_lavc.cpp lavc_file.cpp video_provider_lavc.cpp lavc_keyframes.cpp
-libaudiovideo_ffmpeg_a_CFLAGS = @AVFORMAT_CFLAGS @AVCODEC_CFLAGS@
 aegisub_LDFLAGS += @AVFORMAT_LDFLAGS@ @AVCODEC_LDFLAGS@ @SWSCALE_LDFLAGS@
 aegisub_LDADD += libaudiovideo_ffmpeg.a
 endif
@@ -55,7 +55,7 @@ endif
 if HAVE_LIBASS
 noinst_LIBRARIES += libsubtitle_ass.a
 libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp
-libsubtitle_ass_a_CFLAGS = @LIBASS_CFLAGS@
+libsubtitle_ass_a_CPPFLAGS = @LIBASS_CFLAGS@
 aegisub_LDFLAGS += @LIBASS_LIBS@
 aegisub_LDADD += libsubtitle_ass.a
 endif
@@ -64,13 +64,13 @@ if HAVE_HUNSPELL
 noinst_LIBRARIES += libspell_hunspell.a
 libspell_hunspell_a_SOURCES = spellchecker_hunspell.cpp
 aegisub_LDFLAGS += @HUNSPELL_LDFLAGS@
-aegisub_LDADD +=
+aegisub_LDADD += libspell_hunspell.a
 endif
 
 if HAVE_AUTO4_LUA
 noinst_LIBRARIES += libauto4_lua.a
 libauto4_lua_a_SOURCES = auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp
-libauto4_lua_a_CFLAGS = @LUA_CPPFLAGS@
+libauto4_lua_a_CPPFLAGS = @LUA_CPPFLAGS@
 aegisub_LDFLAGS += @LUA_LDFLAGS@
 aegisub_LDADD += libauto4_lua.a
 endif
@@ -78,7 +78,7 @@ endif
 if HAVE_AUTO4_PERL
 noinst_LIBRARIES += libauto4_perl.a
 libauto4_perl_a_SOURCES = auto4_perl.cpp auto4_perl_script.cpp auto4_perl_dialogs.cpp auto4_perl_ass.cpp auto4_perl_console.cpp auto4_perl.h auto4_perl_console.h
-libauto4_perl_a_CFLAGS = @PERL_CFLAGS@
+libauto4_perl_a_CPPFLAGS = @PERL_CFLAGS@
 aegisub_LDFLAGS += @PERL_LDFLAGS@
 aegisub_LDADD += libauto4_perl.a
 endif
@@ -86,7 +86,7 @@ endif
 if HAVE_AUTO4_RUBY
 noinst_LIBRARIES += libauto4_ruby.a
 libauto4_ruby_a_SOURCES = auto4_ruby_assfile.cpp auto4_ruby.cpp auto4_ruby_dialog.cpp
-lubauto4_ruby_hunspell_a_CFLAGS = @RUBY_CFLAGS@
+libauto4_ruby_a_CPPFLAGS = @RUBY_CFLAGS@
 aegisub_LDFLAGS += @RUBY_LDFLAGS@
 aegisub_LDADD += libauto4_ruby.a
 endif
@@ -97,9 +97,6 @@ aegisub_LDADD += -L$(srcdir)/../auto3 -laegisub-auto3
 endif
 
 
-AUTOMATION = auto4_base.cpp
-AUDIO_PLAYER= audio_player.cpp 
-
 
 ## These aren't built, but are listed here so 'make dist' can always find all the sources
 ## This should also list all Win32 specific files
@@ -138,12 +135,12 @@ EXTRA_aegisub_SOURCES = \
 	win32/stdint.h
 
 aegisub_SOURCES = \
-	$(AUDIO_PLAYER) \
-	$(AUTOMATION) \
 	$(HUNSPELL) \
 	$(LIBASS) \
 	$(FFMPEG) \
 	$(AUTO3_LUA) \
+	auto4_base.cpp \
+	audio_player.cpp \
 	aegisublocale.cpp \
 	ass_attachment.cpp \
 	ass_dialogue.cpp \