Various miscelaneous changes (#6496)

src/core/frontend/applets/swkbd.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <unordered_map>
 #include <utility>
 #include <vector>
 #include "common/assert.h"

src/core/frontend/framebuffer_layout.h

@@ -5,7 +5,10 @@
 #pragma once
 
 #include "common/math_util.h"
-#include "common/settings.h"
+
+namespace Settings {
+enum class LayoutOption : u32;
+}
 
 namespace Layout {