diff --git a/src/core/libraries/ime/ime_dialog_ui.cpp b/src/core/libraries/ime/ime_dialog_ui.cpp
index 3c8bcfddf..e21871897 100644
--- a/src/core/libraries/ime/ime_dialog_ui.cpp
+++ b/src/core/libraries/ime/ime_dialog_ui.cpp
@@ -13,8 +13,8 @@
 #include "core/tls.h"
 #include "imgui/imgui_std.h"
 
-#include "ime_keyboard_layouts.h" // c16rtomb, layout tables
-#include "ime_keyboard_ui.h"      // DrawVirtualKeyboard, Utf8SafeBackspace
+#include "core/libraries/ime/ime_keyboard_layouts.h" // c16rtomb, layout tables
+#include "core/libraries/ime/ime_keyboard_ui.h"      // DrawVirtualKeyboard, Utf8SafeBackspace
 
 using namespace ImGui;
 
diff --git a/src/core/libraries/ime/ime_dialog_ui.h b/src/core/libraries/ime/ime_dialog_ui.h
index b262207ca..19e805635 100644
--- a/src/core/libraries/ime/ime_dialog_ui.h
+++ b/src/core/libraries/ime/ime_dialog_ui.h
@@ -10,7 +10,7 @@
 #include "common/cstring.h"
 #include "common/types.h"
 #include "core/libraries/ime/ime_dialog.h"
-#include "ime_keyboard_ui.h"
+#include "core/libraries/ime/ime_keyboard_ui.h"
 #include "imgui/imgui_layer.h"
 
 namespace Libraries::ImeDialog {
@@ -105,8 +105,6 @@ public:
         input_changed = true;
     }
 
-
-
 private:
     bool CallKeyboardFilter(const OrbisImeKeycode* src_keycode, u16* out_keycode, u32* out_status);
 
diff --git a/src/core/libraries/ime/ime_keyboard_layouts.cpp b/src/core/libraries/ime/ime_keyboard_layouts.cpp
index 7642fcc22..f7b10d4a6 100644
--- a/src/core/libraries/ime/ime_keyboard_layouts.cpp
+++ b/src/core/libraries/ime/ime_keyboard_layouts.cpp
@@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <imgui.h>
-#include "ime_keyboard_layouts.h"
+#include "core/libraries/ime/ime_keyboard_layouts.h"
 
 int c16rtomb(char* out, char16_t ch) {
     if (ch <= 0x7F) {
diff --git a/src/core/libraries/ime/ime_keyboard_layouts.h b/src/core/libraries/ime/ime_keyboard_layouts.h
index b6eb8575c..045b06503 100644
--- a/src/core/libraries/ime/ime_keyboard_layouts.h
+++ b/src/core/libraries/ime/ime_keyboard_layouts.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <string>
 #include <vector>
 #include <imgui.h>
 #include "common/types.h"
@@ -44,12 +43,11 @@ constexpr ImGuiKey Up = ImGuiKey::ImGuiKey_GamepadDpadUp;
 constexpr ImGuiKey Down = ImGuiKey::ImGuiKey_GamepadDpadDown;
 constexpr ImGuiKey Left = ImGuiKey::ImGuiKey_GamepadDpadLeft;
 constexpr ImGuiKey Right = ImGuiKey::ImGuiKey_GamepadDpadRight;
-constexpr ImGuiKey Cross = ImGuiKey::ImGuiKey_GamepadFaceDown; // X button
+constexpr ImGuiKey Cross = ImGuiKey::ImGuiKey_GamepadFaceDown;   // X button
 constexpr ImGuiKey Circle = ImGuiKey::ImGuiKey_GamepadFaceRight; // O button
 constexpr ImGuiKey Square = ImGuiKey::ImGuiKey_GamepadFaceLeft;  // [] button
 constexpr ImGuiKey Triangle = ImGuiKey::ImGuiKey_GamepadFaceUp;  // /\ button
-constexpr ImGuiKey Options = ImGuiKey::ImGuiKey_GraveAccent;   // Options button
-
+constexpr ImGuiKey Options = ImGuiKey::ImGuiKey_GraveAccent;     // Options button
 
 // Fake function keycodes
 constexpr u16 KC_SYM1 = 0xF100;
diff --git a/src/core/libraries/ime/ime_keyboard_ui.cpp b/src/core/libraries/ime/ime_keyboard_ui.cpp
index 68674488c..607af8b5d 100644
--- a/src/core/libraries/ime/ime_keyboard_ui.cpp
+++ b/src/core/libraries/ime/ime_keyboard_ui.cpp
@@ -1,13 +1,12 @@
-#include <cstring>
-#include <unordered_set>
-#include <imgui.h>
-#include <imgui_internal.h>
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "ime_common.h"
-#include "ime_dialog.h"
-#include "ime_keyboard_layouts.h"
-#include "ime_keyboard_ui.h"
-#include "ime_ui.h" // for ImeState
+// #include <cstring>
+#include <imgui.h>
+#include "common/cstring.h"
+#include "core/libraries/ime/ime_common.h"
+#include "core/libraries/ime/ime_keyboard_layouts.h"
+#include "core/libraries/ime/ime_keyboard_ui.h"
 
 using namespace ImGui;
 
diff --git a/src/core/libraries/ime/ime_keyboard_ui.h b/src/core/libraries/ime/ime_keyboard_ui.h
index 9e8fdef86..8b1e43745 100644
--- a/src/core/libraries/ime/ime_keyboard_ui.h
+++ b/src/core/libraries/ime/ime_keyboard_ui.h
@@ -1,14 +1,11 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
-#include <cstddef>
-#include <cstdint>
 #include <vector>
-#include "core/libraries/ime/ime.h"
 #include "core/libraries/ime/ime_common.h"
-#include "core/libraries/ime/ime_error.h"
-#include "core/libraries/ime/ime_ui.h"
-#include "core/libraries/pad/pad.h"
-#include "ime_keyboard_layouts.h"
+#include "core/libraries/ime/ime_keyboard_layouts.h"
 
 /**
  * KeyboardMode: which layout we show (letters, accents, symbols, etc.)
@@ -89,4 +86,4 @@ void RenderKeyboardLayout(const std::vector<KeyEntry>& layout, KeyboardMode mode
  */
 void DrawVirtualKeyboard(KeyboardMode kb_mode, OrbisImeType ime_type, ShiftState shift_state,
                          u64 language, void (*on_key_event)(const VirtualKeyEvent*),
-                         const KeyboardStyle& style);
+                         const KeyboardStyle& style);
\ No newline at end of file
diff --git a/src/core/libraries/ime/ime_ui.cpp b/src/core/libraries/ime/ime_ui.cpp
index 811370098..37f25e200 100644
--- a/src/core/libraries/ime/ime_ui.cpp
+++ b/src/core/libraries/ime/ime_ui.cpp
@@ -249,4 +249,5 @@ int ImeUi::InputTextCallback(ImGuiInputTextCallbackData* data) {
 void ImeUi::Free() {
     RemoveLayer(this);
 }
-}; // namespace Libraries::Ime
\ No newline at end of file
+
+}; // namespace Libraries::Ime
diff --git a/src/core/libraries/ime/ime_ui.h b/src/core/libraries/ime/ime_ui.h
index 880e623d6..3eea22b8c 100644
--- a/src/core/libraries/ime/ime_ui.h
+++ b/src/core/libraries/ime/ime_ui.h
@@ -72,4 +72,5 @@ private:
 
     static int InputTextCallback(ImGuiInputTextCallbackData* data);
 };
+
 }; // namespace Libraries::Ime
\ No newline at end of file