diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 000000000..84c8d4029
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1 @@
+ACLOCAL_AMFLAGS = -I m4
\ No newline at end of file
diff --git a/autogen.sh b/autogen.sh
old mode 100644
new mode 100755
diff --git a/configure.ac b/configure.ac
index d8b874bad..9f4093867 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,11 +58,26 @@ case $host_os in
 		;;
 esac
 
-# checks for wx
-AM_OPTIONS_WXCONFIG
-reqwx=2.9.0
-AM_PATH_WXCONFIG($reqwx, wxWin=1)
-if test "$wxWin" != 1; then
+# checks for ffmpeg
+AC_CHECK_HEADER([libavcodec/avcodec.h], , AC_MSG_ERROR([libavcodec header not found]))
+AC_CHECK_HEADER([libavformat/avformat.h], , AC_MSG_ERROR([libavformat header not found]))
+AC_CHECK_HEADER([libavutil/avutil.h], , AC_MSG_ERROR([libavutil header not found]))
+AC_CHECK_HEADER([libavutil/channel_layout.h], , AC_MSG_ERROR([libavutil header not found]))
+AC_CHECK_HEADER([libswscale/swscale.h], , AC_MSG_ERROR([libswscale header not found]))
+AC_CHECK_HEADER([libswresample/swresample.h], , AC_MSG_ERROR([libswresample header not found]))
+
+AC_CHECK_LIB([avcodec], [avcodec_find_encoder_by_name], , AC_MSG_ERROR([libavcodec not found]), )
+AC_CHECK_LIB([avformat], [av_guess_format], , AC_MSG_ERROR([libavformat not found]))
+AC_CHECK_LIB([avutil], [av_samples_alloc], , AC_MSG_ERROR([libavutil not found]))
+AC_CHECK_LIB([swscale], [sws_scale], , AC_MSG_ERROR([libswscale not found]))
+AC_CHECK_LIB([swresample], [swr_convert], , AC_MSG_ERROR([libswresample not found]))
+
+AC_CHECK_HEADER([jansson.h], , AC_MSG_ERROR([libjansson header not found]))
+AC_CHECK_LIB([jansson], [json_load_file], , AC_MSG_ERROR([libjansson not found]))
+
+WX_CONFIG_OPTIONS
+WX_CONFIG_CHECK(
+	[2.9.0], [wxWin=1], [wxWin=0,
 	AC_MSG_ERROR([
 		wxWidgets must be installed on your system.
  
@@ -71,27 +86,14 @@ if test "$wxWin" != 1; then
 		'wx-config --libs' or 'wx-config --static --libs' command)
 		is in LD_LIBRARY_PATH or equivalent variable and
 		wxWidgets version is $reqwx or above.
-		])
-fi
- 
+		]) ],
+	[core], )
+
 CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
 CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
 CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
 LIBS="$LIBS $WX_LIBS"
 
-# checks for ffmpeg
-AC_CHECK_HEADER([libavcodec/avcodec.h], , AC_MSG_ERROR([libavcodec header not found]))
-AC_CHECK_HEADER([libavformat/avformat.h], , AC_MSG_ERROR([libavformat header not found]))
-AC_CHECK_HEADER([libavutil/avutil.h], , AC_MSG_ERROR([libavutil header not found]))
-AC_CHECK_HEADER([libavutil/channel_layout.h], , AC_MSG_ERROR([libavutil header not found]))
-AC_CHECK_HEADER([libswscale/swscale.h], , AC_MSG_ERROR([libswscale header not found]))
-AC_CHECK_HEADER([libswresample/swresample.h], , AC_MSG_ERROR([libswresample header not found]))
-AC_CHECK_LIB([avcodec], [avcodec_find_encoder_by_name], , AC_MSG_ERROR([libavcodec not found]))
-AC_CHECK_LIB([avformat], [av_guess_format], , AC_MSG_ERROR([libavformat not found]))
-AC_CHECK_LIB([avutil], [av_samples_alloc], , AC_MSG_ERROR([libavutil not found]))
-AC_CHECK_LIB([swscale], [sws_scale], , AC_MSG_ERROR([libswscale not found]))
-AC_CHECK_LIB([swresample], [swr_convert], , AC_MSG_ERROR([libswresample not found]))
-
 # Checks for header files.
 AC_PATH_X
 AC_CHECK_HEADERS([inttypes.h limits.h malloc.h stddef.h stdint.h stdlib.h string.h sys/timeb.h wchar.h wctype.h])
@@ -114,9 +116,6 @@ AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
 AC_CHECK_TYPES([ptrdiff_t])
 
-AC_CHECK_HEADER([jansson.h], , AC_MSG_ERROR([libjansson header not found]))
-AC_CHECK_LIB([jansson], [json_load_file], , AC_MSG_ERROR([libjansson not found]))
-
 # Checks for library functions.
 AC_FUNC_FSEEKO
 AC_FUNC_STRTOD
diff --git a/libobs-opengl/makefile.am b/libobs-opengl/makefile.am
index d248ab219..8ebc5c248 100644
--- a/libobs-opengl/makefile.am
+++ b/libobs-opengl/makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = -isystem$(top_srcdir)/libobs -isystem./glew/include
-AM_CFLAGS = -DGLEW_NO_GLU -DGLEW_STATIC
+AUTOMAKE_OPTIONS = subdir-objects
+AM_CFLAGS = -DGLEW_NO_GLU -DGLEW_STATIC -isystem$(top_srcdir)/libobs -isystem./glew/include
 
 if OS_WIN
 if ARCH_X86
diff --git a/libobs/makefile.am b/libobs/makefile.am
index 6cbd3b7ee..aebdc75d2 100644
--- a/libobs/makefile.am
+++ b/libobs/makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 if OS_WIN
 if ARCH_X86
 libobsdir = ../build/bin/32bit
diff --git a/makefile.am b/makefile.am
index 20d09245f..8c50e095e 100644
--- a/makefile.am
+++ b/makefile.am
@@ -1,4 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh COPYING README
 SUBDIRS = libobs libobs-opengl test obs
 
diff --git a/obs/makefile.am b/obs/makefile.am
index 6d5ffd09a..90e5c1ef9 100644
--- a/obs/makefile.am
+++ b/obs/makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/libobs
+AUTOMAKE_OPTIONS = subdir-objects
+AM_CPPFLAGS = -I$(top_srcdir)/libobs
 
 if OS_WIN
 if ARCH_X86_64
diff --git a/test/test-input/makefile.am b/test/test-input/makefile.am
index 9e79afe7f..1c34d3150 100644
--- a/test/test-input/makefile.am
+++ b/test/test-input/makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -isystem$(top_srcdir)/libobs
+AM_CFLAGS = -isystem$(top_srcdir)/libobs
 
 if OS_WIN
 if ARCH_X86