Merge branch 'master' of https://github.com/hrydgard/ppsspp into GEDebugger

Core/Config.h

@@ -19,7 +19,6 @@
 
 #include <string>
 #include <vector>
-#include <map>
 
 #include "CommonTypes.h"
 

Core/Debugger/SymbolMap.cpp

@@ -23,7 +23,6 @@
 #endif
 
 #include <algorithm>
-#include <map>
 
 #include "Common/FileUtil.h"
 #include "Globals.h"

Core/Font/PGF.cpp

@@ -20,7 +20,6 @@
 // Thanks to the JPCSP project! This sceFont implementation is basically a C++ take on JPCSP's font code.
 // Some parts, especially in this file, were simply copied, so I guess this really makes this file GPL3.
 
-#include "Common/CommonTypes.h"
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/Font/PGF.h"

Core/HW/SasAudio.cpp

@@ -16,7 +16,6 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "base/basictypes.h"
-#include "../Globals.h"
 #include "../MemMap.h"
 #include "Core/HLE/sceAtrac.h"
 #include "Core/Config.h" 

Core/MIPS/MIPSAnalyst.cpp

@@ -16,7 +16,6 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <map>
-#include "Globals.h"
 
 #include "Common/FileUtil.h"
 #include "Core/MIPS/MIPS.h"

Core/Reporting.cpp

@@ -34,7 +34,6 @@
 #include "base/buffer.h"
 
 #include <stdlib.h>
-#include <string>
 #include <cstdarg>
 
 namespace Reporting

Core/Util/BlockAllocator.h

@@ -19,8 +19,6 @@
 
 #include "../../Globals.h"
 
-#include <list>
-
 class PointerWrap;
 
 // Generic allocator thingy. Allocates blocks from a range.