diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c9983f5a..acfe9a43 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -153,7 +153,8 @@ if ("A32" IN_LIST DYNARMIC_FRONTENDS)
         frontend/A32/translate/impl/status_register_access.cpp
         frontend/A32/translate/impl/synchronization.cpp
         frontend/A32/translate/impl/thumb16.cpp
-        frontend/A32/translate/impl/thumb32.cpp
+        frontend/A32/translate/impl/thumb32_branch.cpp
+        frontend/A32/translate/impl/thumb32_control.cpp
         frontend/A32/translate/impl/thumb32_data_processing_register.cpp
         frontend/A32/translate/impl/thumb32_long_multiply.cpp
         frontend/A32/translate/impl/thumb32_misc.cpp
diff --git a/src/frontend/A32/translate/impl/thumb32.cpp b/src/frontend/A32/translate/impl/thumb32_branch.cpp
similarity index 95%
rename from src/frontend/A32/translate/impl/thumb32.cpp
rename to src/frontend/A32/translate/impl/thumb32_branch.cpp
index d79e4f5b..ebd82401 100644
--- a/src/frontend/A32/translate/impl/thumb32.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_branch.cpp
@@ -44,8 +44,4 @@ bool ThumbTranslatorVisitor::thumb32_BLX_imm(Imm<11> hi, Imm<11> lo) {
     return false;
 }
 
-bool ThumbTranslatorVisitor::thumb32_UDF() {
-    return thumb16_UDF();
-}
-
 } // namespace Dynarmic::A32
diff --git a/src/frontend/A32/translate/impl/thumb32_control.cpp b/src/frontend/A32/translate/impl/thumb32_control.cpp
new file mode 100644
index 00000000..a42ca76a
--- /dev/null
+++ b/src/frontend/A32/translate/impl/thumb32_control.cpp
@@ -0,0 +1,14 @@
+/* This file is part of the dynarmic project.
+ * Copyright (c) 2016 MerryMage
+ * SPDX-License-Identifier: 0BSD
+ */
+
+#include "frontend/A32/translate/impl/translate_thumb.h"
+
+namespace Dynarmic::A32 {
+
+bool ThumbTranslatorVisitor::thumb32_UDF() {
+    return thumb16_UDF();
+}
+
+} // namespace Dynarmic::A32