diff --git a/obs/CMakeLists.txt b/obs/CMakeLists.txt
index 45f4af316..35bda4f16 100644
--- a/obs/CMakeLists.txt
+++ b/obs/CMakeLists.txt
@@ -30,8 +30,8 @@ include_directories(SYSTEM ${obs_SOURCE_DIR}/libobs)
 link_libraries(${wxWidgets_LIBRARIES} libobs)
 
 add_executable(obs
-	window-obs-basic.cpp
-	window-subclass.cpp
+	window-main-basic.cpp
+	wx-subclass.cpp
 	wx-wrappers.cpp
 	obs-app.cpp
 	forms/OBSWindows.cpp)
diff --git a/obs/makefile.am b/obs/makefile.am
index 918d12735..7953aff5b 100644
--- a/obs/makefile.am
+++ b/obs/makefile.am
@@ -12,8 +12,8 @@ endif
 
 obs_PROGRAMS = obs
 obs_LDADD = $(top_srcdir)/libobs/libobs.la
-obs_SOURCES = window-obs-basic.cpp \
-	      window-subclass.cpp \
+obs_SOURCES = window-main-basic.cpp \
 	      obs-app.cpp \
+	      wx-subclass.cpp \
 	      wx-wrappers.cpp \
 	      forms/OBSWindows.cpp