diff --git a/obs/obs-app.cpp b/obs/obs-app.cpp
index fbdc10bf7..3250bbf2a 100644
--- a/obs/obs-app.cpp
+++ b/obs/obs-app.cpp
@@ -24,7 +24,7 @@
 #include <obs.hpp>
 
 #include "obs-app.hpp"
-#include "window-main-basic.hpp"
+#include "window-basic-main.hpp"
 #include "wx-wrappers.hpp"
 #include "platform.hpp"
 
diff --git a/obs/settings-basic-general.cpp b/obs/settings-basic-general.cpp
index 21cb5cce4..8dbcb024a 100644
--- a/obs/settings-basic-general.cpp
+++ b/obs/settings-basic-general.cpp
@@ -19,7 +19,7 @@
 
 #include "obs-app.hpp"
 #include "settings-basic.hpp"
-#include "window-settings-basic.hpp"
+#include "window-basic-settings.hpp"
 #include "wx-wrappers.hpp"
 #include "platform.hpp"
 
diff --git a/obs/settings-basic-video.cpp b/obs/settings-basic-video.cpp
index 4a11678d5..fa7f8f663 100644
--- a/obs/settings-basic-video.cpp
+++ b/obs/settings-basic-video.cpp
@@ -19,7 +19,7 @@
 
 #include "obs-app.hpp"
 #include "settings-basic.hpp"
-#include "window-settings-basic.hpp"
+#include "window-basic-settings.hpp"
 #include "wx-wrappers.hpp"
 #include "platform.hpp"
 
diff --git a/obs/settings-basic.cpp b/obs/settings-basic.cpp
index 8f818eb0b..88283b6c3 100644
--- a/obs/settings-basic.cpp
+++ b/obs/settings-basic.cpp
@@ -16,7 +16,7 @@
 ******************************************************************************/
 
 #include "settings-basic.hpp"
-#include "window-settings-basic.hpp"
+#include "window-basic-settingshpp"
 
 void BasicSettingsData::SetChanged()
 {
diff --git a/obs/window-main-basic.cpp b/obs/window-basic-main.cpp
similarity index 98%
rename from obs/window-main-basic.cpp
rename to obs/window-basic-main.cpp
index 87c925726..e805258cc 100644
--- a/obs/window-main-basic.cpp
+++ b/obs/window-basic-main.cpp
@@ -19,8 +19,8 @@
 
 #include "obs-app.hpp"
 #include "wx-wrappers.hpp"
-#include "window-settings-basic.hpp"
-#include "window-main-basic.hpp"
+#include "window-basic-settings.hpp"
+#include "window-basic-main.hpp"
 
 void OBSBasic::SceneAdded(obs_source_t source)
 {
diff --git a/obs/window-main-basic.hpp b/obs/window-basic-main.hpp
similarity index 100%
rename from obs/window-main-basic.hpp
rename to obs/window-basic-main.hpp
diff --git a/obs/window-settings-basic.cpp b/obs/window-basic-settings.cpp
similarity index 98%
rename from obs/window-settings-basic.cpp
rename to obs/window-basic-settings.cpp
index cf294a450..f3dc5953c 100644
--- a/obs/window-settings-basic.cpp
+++ b/obs/window-basic-settings.cpp
@@ -16,7 +16,7 @@
 ******************************************************************************/
 
 #include <wx/msgdlg.h>
-#include "window-settings-basic.hpp"
+#include "window-basic-settings.hpp"
 
 OBSBasicSettings::OBSBasicSettings(wxWindow *parent)
 	: OBSBasicSettingsBase(parent)
diff --git a/obs/window-settings-basic.hpp b/obs/window-basic-settings.hpp
similarity index 100%
rename from obs/window-settings-basic.hpp
rename to obs/window-basic-settings.hpp