Merge pull request #3975 from lioncash/header

FifoPlayer: Remove unnecessary headers/namespace cleanup

Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp

@@ -5,11 +5,11 @@
 #include <algorithm>
 #include <numeric>
 
+#include "Core/FifoPlayer/FifoAnalyzer.h"
+
 #include "Common/Assert.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
-#include "Core/FifoPlayer/FifoAnalyzer.h"
-#include "Core/FifoPlayer/FifoPlaybackAnalyzer.h"
 #include "Core/FifoPlayer/FifoRecordAnalyzer.h"
 #include "VideoCommon/OpcodeDecoding.h"
 #include "VideoCommon/VertexLoader.h"

Source/Core/Core/FifoPlayer/FifoAnalyzer.h

@@ -6,7 +6,6 @@
 
 #include "Common/CommonTypes.h"
 
-#include "VideoCommon/BPMemory.h"
 #include "VideoCommon/CPMemory.h"
 
 namespace FifoAnalyzer

Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp

@@ -3,13 +3,10 @@
 // Refer to the license.txt file included.
 
 #include "Core/FifoPlayer/FifoPlaybackAnalyzer.h"
-#include "Common/Assert.h"
+
 #include "Common/CommonTypes.h"
 #include "Core/FifoPlayer/FifoAnalyzer.h"
 #include "Core/FifoPlayer/FifoDataFile.h"
-#include "VideoCommon/OpcodeDecoding.h"
-#include "VideoCommon/TextureDecoder.h"
-#include "VideoCommon/VertexLoader.h"
 
 using namespace FifoAnalyzer;
 

Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h

@@ -7,7 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "Core/FifoPlayer/FifoAnalyzer.h"
 #include "Core/FifoPlayer/FifoDataFile.h"
 
 struct AnalyzedFrameInfo
@@ -20,4 +19,4 @@ struct AnalyzedFrameInfo
 namespace FifoPlaybackAnalyzer
 {
 void AnalyzeFrames(FifoDataFile* file, std::vector<AnalyzedFrameInfo>& frameInfo);
-};
+}  // namespace FifoPlaybackAnalyzer

Source/Core/Core/FifoPlayer/FifoPlayer.cpp

@@ -5,14 +5,15 @@
 #include <algorithm>
 #include <mutex>
 
+#include "Core/FifoPlayer/FifoPlayer.h"
+
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/MsgHandler.h"
 #include "Core/ConfigManager.h"
-#include "Core/Core.h"
 #include "Core/CoreTiming.h"
+#include "Core/FifoPlayer/FifoAnalyzer.h"
 #include "Core/FifoPlayer/FifoDataFile.h"
-#include "Core/FifoPlayer/FifoPlayer.h"
 #include "Core/HW/CPU.h"
 #include "Core/HW/GPFifo.h"
 #include "Core/HW/Memmap.h"

Source/Core/Core/FifoPlayer/FifoPlayer.h

@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "Core/FifoPlayer/FifoDataFile.h"
 #include "Core/FifoPlayer/FifoPlaybackAnalyzer.h"
 #include "Core/PowerPC/CPUCoreBase.h"
 

Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp

@@ -4,14 +4,11 @@
 
 #include <algorithm>
 
-#include "Common/Assert.h"
-#include "Core/Core.h"
-#include "Core/FifoPlayer/FifoAnalyzer.h"
 #include "Core/FifoPlayer/FifoRecordAnalyzer.h"
+
+#include "Core/FifoPlayer/FifoAnalyzer.h"
 #include "Core/FifoPlayer/FifoRecorder.h"
 #include "Core/HW/Memmap.h"
-#include "VideoCommon/OpcodeDecoding.h"
-#include "VideoCommon/TextureDecoder.h"
 
 using namespace FifoAnalyzer;
 

Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h

@@ -6,10 +6,6 @@
 
 #include "Common/CommonTypes.h"
 
-#include "Core/FifoPlayer/FifoAnalyzer.h"
-
-#include "VideoCommon/BPMemory.h"
-
 namespace FifoRecordAnalyzer
 {
 // Must call this before analyzing Fifo commands with FifoAnalyzer::AnalyzeCommand()
@@ -17,4 +13,4 @@ void Initialize(u32* cpMem);
 
 void ProcessLoadIndexedXf(u32 val, int array);
 void WriteVertexArray(int arrayIndex, const u8* vertexData, int vertexSize, int numVertices);
-};
+}  // namespace FifoRecordAnalyzer

Source/Core/Core/FifoPlayer/FifoRecorder.cpp

@@ -5,10 +5,12 @@
 #include <algorithm>
 #include <mutex>
 
+#include "Core/FifoPlayer/FifoRecorder.h"
+
 #include "Common/Thread.h"
 #include "Core/ConfigManager.h"
-#include "Core/Core.h"
-#include "Core/FifoPlayer/FifoRecorder.h"
+#include "Core/FifoPlayer/FifoAnalyzer.h"
+#include "Core/FifoPlayer/FifoRecordAnalyzer.h"
 #include "Core/HW/Memmap.h"
 
 static FifoRecorder instance;

Source/Core/Core/FifoPlayer/FifoRecorder.h

@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "Core/FifoPlayer/FifoDataFile.h"
-#include "Core/FifoPlayer/FifoRecordAnalyzer.h"
 
 class FifoRecorder
 {