diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 42e667aca..29a4c4707 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -105,10 +105,6 @@ ADD_LIBRARY(lmmsobjs OBJECT
 GENERATE_EXPORT_HEADER(lmmsobjs
 	BASE_NAME lmms
 )
-# GENERATE_EXPORT_HEADER doesn't seem to do this automatically
-TARGET_COMPILE_DEFINITIONS(lmmsobjs
-	PRIVATE -Dlmmsobjs_EXPORTS
-)
 
 ADD_EXECUTABLE(lmms
 	core/main.cpp
@@ -119,6 +115,14 @@ TARGET_INCLUDE_DIRECTORIES(lmms
 	PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
 )
 
+# GENERATE_EXPORT_HEADER doesn't do this automatically for OBJECT libraries
+TARGET_COMPILE_DEFINITIONS(lmmsobjs
+	PRIVATE -Dlmmsobjs_EXPORTS
+)
+TARGET_COMPILE_DEFINITIONS(lmms
+	PRIVATE -Dlmmsobjs_EXPORTS
+)
+
 # Set Visual Studio startup project to lmms
 # https://stackoverflow.com/a/37994396/8166701
 IF(NOT CMAKE_VERSION VERSION_LESS 3.6)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ca78a5eb4..249e38191 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,6 +2,7 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}")
 INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}")
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
 INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}")
+INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/src")
 
 SET(CMAKE_CXX_STANDARD 11)