diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 8a511e02f7..a0ba252b3b 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -21,22 +21,22 @@ set(SRCS
             )
 
 set(HEADERS
-            config/controller_config.hxx
-            config/controller_config_util.hxx
+            config/controller_config.h
+            config/controller_config_util.h
             config.h
-            debugger/callstack.hxx
-            debugger/disassembler.hxx
-            debugger/graphics.hxx
-            debugger/graphics_breakpoints.hxx
-            debugger/graphics_breakpoints_p.hxx
-            debugger/graphics_cmdlists.hxx
-            debugger/graphics_framebuffer.hxx
-            debugger/ramview.hxx
-            debugger/registers.hxx
-            util/spinbox.hxx
-            bootmanager.hxx
-            hotkeys.hxx
-            main.hxx
+            debugger/callstack.h
+            debugger/disassembler.h
+            debugger/graphics.h
+            debugger/graphics_breakpoints.h
+            debugger/graphics_breakpoints_p.h
+            debugger/graphics_cmdlists.h
+            debugger/graphics_framebuffer.h
+            debugger/ramview.h
+            debugger/registers.h
+            util/spinbox.h
+            bootmanager.h
+            hotkeys.h
+            main.h
             version.h
             )
 
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index e753ea108c..3e24da596a 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -9,7 +9,7 @@
 #endif
 
 #include "common/common.h"
-#include "bootmanager.hxx"
+#include "bootmanager.h"
 
 #include "core/core.h"
 #include "core/settings.h"
diff --git a/src/citra_qt/bootmanager.hxx b/src/citra_qt/bootmanager.h
similarity index 100%
rename from src/citra_qt/bootmanager.hxx
rename to src/citra_qt/bootmanager.h
diff --git a/src/citra_qt/config/controller_config.cpp b/src/citra_qt/config/controller_config.cpp
index 41000e29ba..892995bb26 100644
--- a/src/citra_qt/config/controller_config.cpp
+++ b/src/citra_qt/config/controller_config.cpp
@@ -4,8 +4,8 @@
 
 #include <QDialogButtonBox>
 
-#include "controller_config.hxx"
-#include "controller_config_util.hxx"
+#include "controller_config.h"
+#include "controller_config_util.h"
 
 /* TODO(bunnei): ImplementMe
 
diff --git a/src/citra_qt/config/controller_config.hxx b/src/citra_qt/config/controller_config.h
similarity index 100%
rename from src/citra_qt/config/controller_config.hxx
rename to src/citra_qt/config/controller_config.h
diff --git a/src/citra_qt/config/controller_config_util.cpp b/src/citra_qt/config/controller_config_util.cpp
index 272e8d41ed..d68b119dfd 100644
--- a/src/citra_qt/config/controller_config_util.cpp
+++ b/src/citra_qt/config/controller_config_util.cpp
@@ -9,7 +9,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 
-#include "controller_config_util.hxx"
+#include "controller_config_util.h"
 
 /* TODO(bunnei): ImplementMe
 GStickConfig::GStickConfig(common::Config::Control leftid, common::Config::Control rightid, common::Config::Control upid, common::Config::Control downid, QObject* change_receiver, QWidget* parent) : QWidget(parent)
diff --git a/src/citra_qt/config/controller_config_util.hxx b/src/citra_qt/config/controller_config_util.h
similarity index 100%
rename from src/citra_qt/config/controller_config_util.hxx
rename to src/citra_qt/config/controller_config_util.h
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp
index 4a47ad4682..bcc5d21439 100644
--- a/src/citra_qt/debugger/callstack.cpp
+++ b/src/citra_qt/debugger/callstack.cpp
@@ -4,7 +4,7 @@
 
 #include <QStandardItemModel>
 
-#include "callstack.hxx"
+#include "callstack.h"
 
 #include "core/core.h"
 #include "core/arm/arm_interface.h"
diff --git a/src/citra_qt/debugger/callstack.hxx b/src/citra_qt/debugger/callstack.h
similarity index 100%
rename from src/citra_qt/debugger/callstack.hxx
rename to src/citra_qt/debugger/callstack.h
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp
index 636a0f187f..8db73752f7 100644
--- a/src/citra_qt/debugger/disassembler.cpp
+++ b/src/citra_qt/debugger/disassembler.cpp
@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "disassembler.hxx"
+#include "disassembler.h"
 
-#include "../bootmanager.hxx"
-#include "../hotkeys.hxx"
+#include "../bootmanager.h"
+#include "../hotkeys.h"
 
 #include "common/common.h"
 #include "core/mem_map.h"
diff --git a/src/citra_qt/debugger/disassembler.hxx b/src/citra_qt/debugger/disassembler.h
similarity index 100%
rename from src/citra_qt/debugger/disassembler.hxx
rename to src/citra_qt/debugger/disassembler.h
diff --git a/src/citra_qt/debugger/graphics.cpp b/src/citra_qt/debugger/graphics.cpp
index 9633d367e3..7424671f18 100644
--- a/src/citra_qt/debugger/graphics.cpp
+++ b/src/citra_qt/debugger/graphics.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "graphics.hxx"
+#include "graphics.h"
 #include <QListView>
 #include <QVBoxLayout>
 #include <QDebug>
diff --git a/src/citra_qt/debugger/graphics.hxx b/src/citra_qt/debugger/graphics.h
similarity index 100%
rename from src/citra_qt/debugger/graphics.hxx
rename to src/citra_qt/debugger/graphics.h
diff --git a/src/citra_qt/debugger/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics_breakpoints.cpp
index 170aa736d4..262e2e770c 100644
--- a/src/citra_qt/debugger/graphics_breakpoints.cpp
+++ b/src/citra_qt/debugger/graphics_breakpoints.cpp
@@ -8,8 +8,8 @@
 #include <QVBoxLayout>
 #include <QLabel>
 
-#include "graphics_breakpoints.hxx"
-#include "graphics_breakpoints_p.hxx"
+#include "graphics_breakpoints.h"
+#include "graphics_breakpoints_p.h"
 
 BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent)
     : QAbstractListModel(parent), context_weak(debug_context),
diff --git a/src/citra_qt/debugger/graphics_breakpoints.hxx b/src/citra_qt/debugger/graphics_breakpoints.h
similarity index 100%
rename from src/citra_qt/debugger/graphics_breakpoints.hxx
rename to src/citra_qt/debugger/graphics_breakpoints.h
diff --git a/src/citra_qt/debugger/graphics_breakpoints_p.hxx b/src/citra_qt/debugger/graphics_breakpoints_p.h
similarity index 100%
rename from src/citra_qt/debugger/graphics_breakpoints_p.hxx
rename to src/citra_qt/debugger/graphics_breakpoints_p.h
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp
index 708b805a7d..4a6159fdf9 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics_cmdlists.cpp
@@ -16,9 +16,9 @@
 
 #include "video_core/debug_utils/debug_utils.h"
 
-#include "graphics_cmdlists.hxx"
+#include "graphics_cmdlists.h"
 
-#include "util/spinbox.hxx"
+#include "util/spinbox.h"
 
 QImage LoadTexture(u8* src, const Pica::DebugUtils::TextureInfo& info) {
     QImage decoded_image(info.width, info.height, QImage::Format_ARGB32);
diff --git a/src/citra_qt/debugger/graphics_cmdlists.hxx b/src/citra_qt/debugger/graphics_cmdlists.h
similarity index 100%
rename from src/citra_qt/debugger/graphics_cmdlists.hxx
rename to src/citra_qt/debugger/graphics_cmdlists.h
diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp
index 7ef699f374..caa6896f91 100644
--- a/src/citra_qt/debugger/graphics_framebuffer.cpp
+++ b/src/citra_qt/debugger/graphics_framebuffer.cpp
@@ -13,9 +13,9 @@
 #include "video_core/color.h"
 #include "video_core/pica.h"
 
-#include "graphics_framebuffer.hxx"
+#include "graphics_framebuffer.h"
 
-#include "util/spinbox.hxx"
+#include "util/spinbox.h"
 
 BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context,
                                                const QString& title, QWidget* parent)
diff --git a/src/citra_qt/debugger/graphics_framebuffer.hxx b/src/citra_qt/debugger/graphics_framebuffer.h
similarity index 100%
rename from src/citra_qt/debugger/graphics_framebuffer.hxx
rename to src/citra_qt/debugger/graphics_framebuffer.h
diff --git a/src/citra_qt/debugger/ramview.cpp b/src/citra_qt/debugger/ramview.cpp
index d3ff69a61e..2b199bad14 100644
--- a/src/citra_qt/debugger/ramview.cpp
+++ b/src/citra_qt/debugger/ramview.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "ramview.hxx"
+#include "ramview.h"
 
 #include "common/common.h"
 #include "core/mem_map.h"
diff --git a/src/citra_qt/debugger/ramview.hxx b/src/citra_qt/debugger/ramview.h
similarity index 100%
rename from src/citra_qt/debugger/ramview.hxx
rename to src/citra_qt/debugger/ramview.h
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp
index f798495b2c..e982dfb3f4 100644
--- a/src/citra_qt/debugger/registers.cpp
+++ b/src/citra_qt/debugger/registers.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "registers.hxx"
+#include "registers.h"
 
 #include "core/core.h"
 #include "core/arm/arm_interface.h"
diff --git a/src/citra_qt/debugger/registers.hxx b/src/citra_qt/debugger/registers.h
similarity index 100%
rename from src/citra_qt/debugger/registers.hxx
rename to src/citra_qt/debugger/registers.h
diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp
index 08be7ff74e..322c25c9ee 100644
--- a/src/citra_qt/hotkeys.cpp
+++ b/src/citra_qt/hotkeys.cpp
@@ -4,7 +4,7 @@
 
 #include <QKeySequence>
 #include <QSettings>
-#include "hotkeys.hxx"
+#include "hotkeys.h"
 #include <map>
 
 struct Hotkey
diff --git a/src/citra_qt/hotkeys.hxx b/src/citra_qt/hotkeys.h
similarity index 100%
rename from src/citra_qt/hotkeys.hxx
rename to src/citra_qt/hotkeys.h
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 64e389f258..c6671bef1e 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -8,7 +8,7 @@
 #include <QDesktopWidget>
 #include <QFileDialog>
 #include "qhexedit.h"
-#include "main.hxx"
+#include "main.h"
 
 #include "common/common.h"
 #include "common/logging/text_formatter.h"
@@ -22,18 +22,18 @@
 #include <unistd.h>
 #endif
 
-#include "bootmanager.hxx"
-#include "hotkeys.hxx"
+#include "bootmanager.h"
+#include "hotkeys.h"
 
 //debugger
-#include "debugger/disassembler.hxx"
-#include "debugger/registers.hxx"
-#include "debugger/callstack.hxx"
-#include "debugger/ramview.hxx"
-#include "debugger/graphics.hxx"
-#include "debugger/graphics_breakpoints.hxx"
-#include "debugger/graphics_cmdlists.hxx"
-#include "debugger/graphics_framebuffer.hxx"
+#include "debugger/disassembler.h"
+#include "debugger/registers.h"
+#include "debugger/callstack.h"
+#include "debugger/ramview.h"
+#include "debugger/graphics.h"
+#include "debugger/graphics_breakpoints.h"
+#include "debugger/graphics_cmdlists.h"
+#include "debugger/graphics_framebuffer.h"
 
 #include "core/settings.h"
 #include "core/system.h"
diff --git a/src/citra_qt/main.hxx b/src/citra_qt/main.h
similarity index 100%
rename from src/citra_qt/main.hxx
rename to src/citra_qt/main.h
diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp
index f9988409f6..54f628e4c3 100644
--- a/src/citra_qt/util/spinbox.cpp
+++ b/src/citra_qt/util/spinbox.cpp
@@ -34,7 +34,7 @@
 
 #include "common/log.h"
 
-#include "spinbox.hxx"
+#include "spinbox.h"
 
 CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), base(10), min_value(-100), max_value(100), value(0), num_digits(0)
 {
diff --git a/src/citra_qt/util/spinbox.hxx b/src/citra_qt/util/spinbox.h
similarity index 100%
rename from src/citra_qt/util/spinbox.hxx
rename to src/citra_qt/util/spinbox.h