diff --git a/command_event.h b/command_event.h
index ce496d8937..483416e14f 100644
--- a/command_event.h
+++ b/command_event.h
@@ -18,6 +18,7 @@
 
 #include <stdint.h>
 #include <boolean.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/dynamic.c b/dynamic.c
index a3969c7b00..becc509c19 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -28,6 +28,7 @@
 #include "config.h"
 #endif
 
+#include "command_event.h"
 #include "audio/audio_driver.h"
 #include "camera/camera_driver.h"
 #include "location/location_driver.h"
diff --git a/retroarch.h b/retroarch.h
index 3ef7f02ffe..30b895ef8f 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -20,8 +20,6 @@
 #include <boolean.h>
 #include <retro_miscellaneous.h>
 
-#include "command_event.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif