diff --git a/CMakeLists.txt b/CMakeLists.txt
index d55d0deda..e56b710ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,6 +78,7 @@ elseif(WIN32)
     )
 endif(UNIX)
 SET_TARGET_PROPERTIES(libaegisub PROPERTIES PREFIX "")
+target_compile_definitions(libaegisub PRIVATE CMAKE_BUILD)
 
 add_library(luabins STATIC
     vendor/luabins/src/fwrite.c
@@ -428,6 +429,7 @@ add_executable(Aegisub WIN32
     src/visual_feature.cpp
 )
 target_link_libraries(Aegisub ${CMAKE_DL_LIBS} libaegisub luabins luajit resrc csri)
+target_compile_definitions(Aegisub PRIVATE CMAKE_BUILD)
 
 if (MSVC)
     set_target_properties(libaegisub PROPERTIES COMPILE_FLAGS "/Yu${PROJECT_SOURCE_DIR}/libaegisub/lagi_pre.h" COMPILE_FLAGS "/FI${PROJECT_SOURCE_DIR}/libaegisub/lagi_pre.h")
diff --git a/libaegisub/lagi_pre.h b/libaegisub/lagi_pre.h
index a946bac5a..9b4985d76 100644
--- a/libaegisub/lagi_pre.h
+++ b/libaegisub/lagi_pre.h
@@ -1,4 +1,7 @@
 #ifdef __cplusplus
+#if !defined(_WIN32) && !defined(CMAKE_BUILD)
+#include "../acconf.h"
+#endif
 
 #define WIN32_LEAN_AND_MEAN
 
diff --git a/src/Makefile b/src/Makefile
index 38a809c06..42e357aeb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -66,6 +66,7 @@ src_OBJ := \
 	$(d)help_button.o \
 	$(d)hotkey.o \
 	$(d)hotkey_data_view_model.o \
+	$(d)image_position_picker.o \
 	$(d)initial_line_state.o \
 	$(d)main.o \
 	$(d)menu.o \
diff --git a/src/agi_pre.h b/src/agi_pre.h
index fb983bc6b..9a97aeb5e 100644
--- a/src/agi_pre.h
+++ b/src/agi_pre.h
@@ -48,6 +48,10 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
+#if !defined(_WIN32) && !defined(CMAKE_BUILD)
+#include "../acconf.h"
+#endif
+
 #define WIN32_LEAN_AND_MEAN
 
 // Common C