diff --git a/backends/keymapper/keymap.h b/backends/keymapper/keymap.h
index 4d584a2afa2..a5f7df69277 100644
--- a/backends/keymapper/keymap.h
+++ b/backends/keymapper/keymap.h
@@ -38,8 +38,8 @@ namespace Common {
 
 const char *const kStandardActionsKeymapName = "standard-actions";
 
-class Action;
-class Event;
+struct Action;
+struct Event;
 struct HardwareInput;
 class HardwareInputSet;
 class KeymapperDefaultBindings;
diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h
index 4adee5376b3..c5d08cb5b09 100644
--- a/backends/keymapper/keymapper.h
+++ b/backends/keymapper/keymapper.h
@@ -36,7 +36,7 @@ namespace Common {
 const char *const kGuiKeymapName = "gui";
 const char *const kGlobalKeymapName = "global";
 
-class Action;
+struct Action;
 class DelayedEventSource;
 struct HardwareInput;
 class HardwareInputSet;
diff --git a/backends/keymapper/remap-widget.h b/backends/keymapper/remap-widget.h
index 684575ac9e8..112f5addcfe 100644
--- a/backends/keymapper/remap-widget.h
+++ b/backends/keymapper/remap-widget.h
@@ -38,7 +38,7 @@ class StaticTextWidget;
 
 namespace Common {
 
-class Action;
+struct Action;
 class Keymap;
 class Keymapper;
 class InputWatcher;