diff --git a/Source/Core/Core/System.cpp b/Source/Core/Core/System.cpp
index 2c64c7f2b6..686d1a3264 100644
--- a/Source/Core/Core/System.cpp
+++ b/Source/Core/Core/System.cpp
@@ -36,10 +36,12 @@
 #include "VideoCommon/CommandProcessor.h"
 #include "VideoCommon/Fifo.h"
 #include "VideoCommon/GeometryShaderManager.h"
+#include "VideoCommon/PerformanceMetrics.h"
 #include "VideoCommon/PixelEngine.h"
 #include "VideoCommon/PixelShaderManager.h"
 #include "VideoCommon/Resources/CustomResourceManager.h"
 #include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoEvents.h"
 #include "VideoCommon/XFStateManager.h"
 
 namespace Core
diff --git a/Source/Core/Core/System.h b/Source/Core/Core/System.h
index 8b8e8e4a87..a170c608ee 100644
--- a/Source/Core/Core/System.h
+++ b/Source/Core/Core/System.h
@@ -5,16 +5,15 @@
 
 #include <memory>
 
-#include "VideoCommon/PerformanceMetrics.h"
-#include "VideoCommon/VideoEvents.h"
-
 class GeometryShaderManager;
 class Interpreter;
 class JitInterface;
+class PerformanceMetrics;
 class PixelShaderManager;
 class SoundStream;
 struct Sram;
 class VertexShaderManager;
+struct VideoEvents;
 class XFStateManager;
 
 namespace AudioInterface