diff --git a/libobs-opengl/CMakeLists.txt b/libobs-opengl/CMakeLists.txt
index 174289755..a01442246 100644
--- a/libobs-opengl/CMakeLists.txt
+++ b/libobs-opengl/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 
 option(USE_STATIC_GLEW "Build using bundled GLEW" ${WIN32})
 
-include_directories(${obs_SOURCE_DIR}/libobs)
+include_directories(SYSTEM ${obs_SOURCE_DIR}/libobs)
 
 find_package(OpenGL REQUIRED)
 include_directories(${OPENGL_INCLUDE_DIRS})
@@ -26,7 +26,7 @@ if(NOT USE_STATIC_GLEW)
 	include_directories(${GLEW_INCLUDE_DIRS})
 	set(GLEW_SRC)
 else()
-	include_directories(glew/include)
+	include_directories(SYSTEM glew/include)
 	add_definitions(-DGLEW_STATIC)
 	set(GLEW_SRC glew/src/glew.c)
 endif()
diff --git a/obs/CMakeLists.txt b/obs/CMakeLists.txt
index af05ba263..1ca54dfb5 100644
--- a/obs/CMakeLists.txt
+++ b/obs/CMakeLists.txt
@@ -10,6 +10,7 @@ function(wx_required_version)
 	endforeach()
 	set(CMAKE_REQUIRED_DEFINITIONS ${WX_CHECK_DEFINITIONS})
 	set(CMAKE_REQUIRED_INCLUDES ${wxWidgets_INCLUDE_DIRS})
+	set(CMAKE_REQUIRED_FLAGS ${wxWidgets_CXX_FLAGS})
 	check_cxx_source_compiles("
 		#include <wx/sysopt.h>
 		#if (wxMINOR_VERSION < 9 && wxMAJOR_VERSION <= 2) || wxMAJOR_VERSION < 3
@@ -24,8 +25,9 @@ function(wx_required_version)
 endfunction()
 wx_required_version()
 
+include_directories(SYSTEM ${obs_SOURCE_DIR}/libobs)
 
-link_libraries(${wxWidgets_LIBRARIES})
+link_libraries(${wxWidgets_LIBRARIES} libobs)
 
 add_executable(obs
 	window-obs-basic.cpp
diff --git a/test/osx/CMakeLists.txt b/test/osx/CMakeLists.txt
index cf860eb59..03db0a2c1 100644
--- a/test/osx/CMakeLists.txt
+++ b/test/osx/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${obs_SOURCE_DIR}/libobs)
+include_directories(SYSTEM ${obs_SOURCE_DIR}/libobs)
 
 find_library(COCOA Cocoa)
 include_directories(${COCOA})
diff --git a/test/osx/test.mm b/test/osx/test.mm
index b900b6228..e75d4b1e8 100644
--- a/test/osx/test.mm
+++ b/test/osx/test.mm
@@ -8,8 +8,8 @@
 #import <AppKit/AppKit.h>
 #import <OpenGL/OpenGL.h>
 
-#include "util/base.h"
-#include "obs.h"
+#include <util/base.h>
+#include <obs.h>
 
 static const int cx = 800;
 static const int cy = 600;
@@ -19,7 +19,7 @@ static const int cy = 600;
 /* --------------------------------------------------- */
 
 using SourceContext = std::unique_ptr<obs_source,
-      std::function<void(obs_source_t)>>;
+      std::function<int(obs_source_t)>>;
 static SourceContext autorelease(obs_source_t s)
 {
 	return SourceContext(s, obs_source_release);
diff --git a/test/test-input/CMakeLists.txt b/test/test-input/CMakeLists.txt
index adf655316..949155b02 100644
--- a/test/test-input/CMakeLists.txt
+++ b/test/test-input/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${obs_SOURCE_DIR}/libobs)
+include_directories(SYSTEM ${obs_SOURCE_DIR}/libobs)
 
 add_library(test-input MODULE
 	test-filter.c