Replace all include guard ifdefs with "#pragma once"

Source/Core/AudioCommon/AOSoundStream.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _AOSOUNDSTREAM_H_
+#pragma once
-#define _AOSOUNDSTREAM_H_
 
 #include "SoundStream.h"
 #include "Thread.h"
@@ -53,5 +52,3 @@ public:
 	AOSound(CMixer *mixer) : SoundStream(mixer) {}
 #endif
 };
-
-#endif //_AOSOUNDSTREAM_H_

Source/Core/AudioCommon/AlsaSoundStream.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ALSA_SOUND_STREAM_H
+#pragma once
-#define _ALSA_SOUND_STREAM_H
 
 #if defined(HAVE_ALSA) && HAVE_ALSA
 #include <alsa/asoundlib.h>
@@ -52,6 +51,3 @@ public:
 	AlsaSound(CMixer *mixer) : SoundStream(mixer) {}
 #endif
 };
-
-#endif
-

Source/Core/AudioCommon/AudioCommon.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _AUDIO_COMMON_H_
+#pragma once
-#define _AUDIO_COMMON_H_
 
 #include "Common.h"
 #include "SoundStream.h"
@@ -47,5 +46,3 @@ namespace AudioCommon
 	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
 	void UpdateSoundStream();
 }
-
-#endif // _AUDIO_COMMON_H_

Source/Core/AudioCommon/CoreAudioSoundStream.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _COREAUDIO_SOUND_STREAM_H
+#pragma once
-#define _COREAUDIO_SOUND_STREAM_H
 
 #ifdef __APPLE__
 #include <AudioUnit/AudioUnit.h>
@@ -46,5 +45,3 @@ public:
 	CoreAudioSound(CMixer *mixer) : SoundStream(mixer) {}
 #endif
 };
-
-#endif

Source/Core/AudioCommon/DPL2Decoder.h

@@ -2,10 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DPL2DECODER_H_
+#pragma once
-#define _DPL2DECODER_H_
 
 void dpl2decode(float *samples, int numsamples, float *out);
 void dpl2reset();
-
-#endif  // _DPL2DECODER_H_

Source/Core/AudioCommon/DSoundStream.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DSOUNDSTREAM_H_
+#pragma once
-#define _DSOUNDSTREAM_H_
 
 #include "SoundStream.h"
 #include "Thread.h"
@@ -76,5 +75,3 @@ public:
 	{}
 #endif
 };
-
-#endif //_DSOUNDSTREAM_H_

Source/Core/AudioCommon/Mixer.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _MIXER_H_
+#pragma once
-#define _MIXER_H_
 
 #include "WaveFile.h"
 #include "StdMutex.h"
@@ -106,5 +105,3 @@ protected:
 private:
 
 };
-
-#endif // _MIXER_H_

Source/Core/AudioCommon/NullSoundStream.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _NULLSOUNDSTREAM_H_
+#pragma once
-#define _NULLSOUNDSTREAM_H_
 
 #include <stdlib.h>
 #include "SoundStream.h"
@@ -31,5 +30,3 @@ public:
 	virtual bool usesMixer() const { return true; }
 	virtual void Update();
 };
-
-#endif //_NULLSOUNDSTREAM_H_

Source/Core/AudioCommon/OpenALStream.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _OPENALSTREAM_H_
+#pragma once
-#define _OPENALSTREAM_H_
 
 #include "SoundStream.h"
 #include "Thread.h"
@@ -79,5 +78,3 @@ public:
 	{}
 #endif // HAVE_OPENAL
 };
-
-#endif // OPENALSTREAM

Source/Core/AudioCommon/OpenSLESStream.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _OPENSLSTREAM_H_
+#pragma once
-#define _OPENSLSTREAM_H_
 
 #include "Thread.h"
 #include "SoundStream.h"
@@ -31,5 +30,3 @@ public:
 	OpenSLESStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {}
 #endif // HAVE_OPENSL
 };
-
-#endif

Source/Core/AudioCommon/PulseAudioStream.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _PULSE_AUDIO_STREAM_H
+#pragma once
-#define _PULSE_AUDIO_STREAM_H
 
 #if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO
 #include <pulse/pulseaudio.h>
@@ -61,5 +60,3 @@ public:
 	PulseAudio(CMixer *mixer) : SoundStream(mixer) {}
 #endif
 };
-
-#endif

Source/Core/AudioCommon/SoundStream.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _SOUNDSTREAM_H_
+#pragma once
-#define _SOUNDSTREAM_H_
 
 #include "Common.h"
 #include "Mixer.h"
@@ -55,5 +54,3 @@ public:
 		}
 	}
 };
-
-#endif // _SOUNDSTREAM_H_

Source/Core/AudioCommon/WaveFile.h

@@ -12,8 +12,7 @@
 // If Stop is not called when it destructs, the destructor will call Stop().
 // ---------------------------------------------------------------------------------
 
-#ifndef _WAVEFILE_H_
+#pragma once
-#define _WAVEFILE_H_
 
 #include "FileUtil.h"
 
@@ -41,5 +40,3 @@ public:
 	void AddStereoSamplesBE(const short *sample_data, u32 count);  // big endian
 	u32 GetAudioSize() const { return audio_size; }
 };
-
-#endif  // _WAVEFILE_H_

Source/Core/AudioCommon/aldlist.h

@@ -1,5 +1,4 @@
-#ifndef ALDEVICELIST_H
+#pragma once
-#define ALDEVICELIST_H
 
 #include "CommonTypes.h"
 #ifdef _WIN32
@@ -47,5 +46,3 @@ public:
 private:
 	u32 GetMaxNumSources();
 };
-
-#endif // ALDEVICELIST_H

Source/Core/Common/ArmEmitter.h

@@ -1,24 +1,10 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
-
+// Licensed under GPLv2
-// This program is free software: you can redistribute it and/or modify
+// Refer to the license.txt file included.
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
 
 // WARNING - THIS LIBRARY IS NOT THREAD SAFE!!!
 
-#ifndef _DOLPHIN_ARM_CODEGEN_
+#pragma once
-#define _DOLPHIN_ARM_CODEGEN_
 
 #include "Common.h"
 #include "MemoryUtil.h"
@@ -796,5 +782,3 @@ extern const VFPEnc VFPOps[16][2];
 extern const char *VFPOpNames[16];
 
 }  // namespace
-
-#endif // _DOLPHIN_INTEL_CODEGEN_

Source/Core/Common/Atomic.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ATOMIC_H_
+#pragma once 
-#define _ATOMIC_H_
 
 #ifdef _WIN32
 
@@ -15,5 +14,3 @@
 #include "Atomic_GCC.h"
 
 #endif
-
-#endif

Source/Core/Common/Atomic_GCC.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ATOMIC_GCC_H_
+#pragma once
-#define _ATOMIC_GCC_H_
 
 #include "Common.h"
 
@@ -86,5 +85,3 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval) {
 }
 
 }
-
-#endif

Source/Core/Common/Atomic_Win32.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ATOMIC_WIN32_H_
+#pragma once
-#define _ATOMIC_WIN32_H_
 
 #include "Common.h"
 #include <intrin.h>
@@ -79,5 +78,3 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval) {
 }
 
 }
-
-#endif

Source/Core/Common/BreakPoints.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DEBUGGER_BREAKPOINTS_H
+#pragma once
-#define _DEBUGGER_BREAKPOINTS_H
 
 #include <vector>
 #include <string>
@@ -97,6 +96,3 @@ public:
 
 	void Clear() { m_MemChecks.clear(); };
 };
-
-#endif
-

Source/Core/Common/CDUtils.h

@@ -1,5 +1,4 @@
-#ifndef _CDUTILS_H_
+#pragma once
-#define _CDUTILS_H_
 
 #include <vector>
 #include <string>
@@ -9,5 +8,3 @@ std::vector<std::string> cdio_get_devices();
 
 // Returns true if device is cdrom/dvd
 bool cdio_is_cdrom(std::string device);
-
-#endif // _CDUTILS_H_

Source/Core/Common/CPUDetect.h

@@ -4,8 +4,7 @@
 
 
 // Detect the cpu, so we'll know which optimizations to use
-#ifndef _CPUDETECT_H_
+#pragma once
-#define _CPUDETECT_H_
 
 #include <string>
 
@@ -85,5 +84,3 @@ private:
 };
 
 extern CPUInfo cpu_info;
-
-#endif // _CPUDETECT_H_

Source/Core/Common/ChunkFile.h

@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
+#pragma once
-#ifndef _POINTERWRAP_H_
-#define _POINTERWRAP_H_
 
 // Extremely simple serialization framework.
 
@@ -431,5 +429,3 @@ private:
 		u32 ExpectedSize;
 	};
 };
-
-#endif  // _POINTERWRAP_H_

Source/Core/Common/ColorUtil.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _COLORUTIL_H_
+#pragma once
-#define _COLORUTIL_H_
 
 namespace ColorUtil
 {
@@ -12,5 +11,3 @@ void decode5A3image(u32* dst, u16* src, int width, int height);
 void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height);
 
 }  // namespace
-
-#endif // _COLORUTIL_H_

Source/Core/Common/Common.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _COMMON_H_
+#pragma once
-#define _COMMON_H_
 
 // DO NOT EVER INCLUDE <windows.h> directly _or indirectly_ from this file
 // since it slows down the build a lot.
@@ -174,5 +173,3 @@ enum EMUSTATE_CHANGE
 };
 
 #include "CommonFuncs.h"
-
-#endif // _COMMON_H_

Source/Core/Common/CommonFuncs.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _COMMONFUNCS_H_
+#pragma once
-#define _COMMONFUNCS_H_
 
 #ifdef _WIN32
 #define SLEEP(x) Sleep(x)
@@ -253,5 +252,3 @@ inline T FromBigEndian(T data)
 }
 
 }  // Namespace Common
-
-#endif // _COMMONFUNCS_H_

Source/Core/Common/CommonPaths.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _COMMON_PATHS_H_
+#pragma once
-#define _COMMON_PATHS_H_
 
 // Make sure we pick up USER_DIR if set in config.h
 #include "Common.h"
@@ -119,5 +118,3 @@
 // Subdirs in Sys
 #define GC_SYS_DIR "GC"
 #define WII_SYS_DIR "Wii"
-
-#endif // _COMMON_PATHS_H_

Source/Core/Common/CommonTypes.h

@@ -7,8 +7,7 @@
 // other parts of the code. Any definitions that are only used by the core should be
 // placed in "Common.h" instead.
 
-#ifndef _COMMONTYPES_H_
+#pragma once
-#define _COMMONTYPES_H_
 
 #include <cstdint>
 #include <cstddef>
@@ -47,5 +46,3 @@ typedef int64_t s64;
 #define LONG int
 
 #endif // _WIN32
-
-#endif // _COMMONTYPES_H_

Source/Core/Common/ConsoleListener.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _CONSOLELISTENER_H
+#pragma once
-#define _CONSOLELISTENER_H
 
 #include "LogManager.h"
 
@@ -37,5 +36,3 @@ private:
 #endif
 	bool bUseColor;
 };
-
-#endif  // _CONSOLELISTENER_H

Source/Core/Common/DebugInterface.h

@@ -1,5 +1,4 @@
-#ifndef _DEBUGINTERFACE_H
+#pragma once
-#define _DEBUGINTERFACE_H
 
 #include <string>
 
@@ -34,5 +33,3 @@ public:
 	virtual int getColor(unsigned int /*address*/){return 0xFFFFFFFF;}
 	virtual std::string getDescription(unsigned int /*address*/) = 0;
 };
-
-#endif

Source/Core/Common/ExtendedTrace.h

@@ -12,8 +12,7 @@
 //
 // ----------------------------------------------------------------------------------------
 
-#ifndef _EXTENDEDTRACE_H_INCLUDED_
+#pragma once
-#define _EXTENDEDTRACE_H_INCLUDED_
 
 #if defined(WIN32)
 
@@ -49,4 +48,3 @@ extern char g_uefbuf[UEFBUFSIZE];
 
 #endif // WIN32
 
-#endif	// _EXTENDEDTRACE_H_INCLUDED_

Source/Core/Common/FPURoundMode.h

@@ -1,21 +1,9 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// This program is free software: you can redistribute it and/or modify
+#pragma once
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#ifndef FPU_ROUND_MODE_H_
-#define FPU_ROUND_MODE_H_
 #include "CommonTypes.h"
 
 namespace FPURoundMode
@@ -49,4 +37,3 @@ namespace FPURoundMode
 	void LoadSIMDState();
 	void LoadDefaultSIMDState();
 }
-#endif

Source/Core/Common/FifoQueue.h

@@ -1,6 +1,4 @@
-
+#pragma once
-#ifndef _FIFO_QUEUE_H_
-#define _FIFO_QUEUE_H_
 
 // a simple lockless thread-safe,
 // single reader, single writer queue
@@ -116,5 +114,3 @@ private:
 };
 
 }
-
-#endif

Source/Core/Common/FileSearch.h

@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
+#pragma once
-#ifndef _FILESEARCH_H_
-#define _FILESEARCH_H_
 
 #include <string>
 #include <vector>
@@ -24,5 +22,3 @@ private:
 	XStringVector m_FileNames;
 };
 
-#endif // _FILESEARCH_H_
-

Source/Core/Common/FileUtil.h

@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
+#pragma once
-#ifndef _FILEUTIL_H_
-#define _FILEUTIL_H_
 
 #include <fstream>
 #include <cstdio>
@@ -237,5 +235,3 @@ void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmod
 	fstream.open(filename.c_str(), openmode);
 #endif
 }
-
-#endif

Source/Core/Common/FixedSizeQueue.h

@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
+#pragma once
-#ifndef _FIXED_SIZE_QUEUE_H_
-#define _FIXED_SIZE_QUEUE_H_
 
 // STL-look-a-like interface, but name is mixed case to distinguish it clearly from the
 // real STL classes.
@@ -70,6 +68,3 @@ public:
 		return count;
 	}
 };
-
-#endif // _FIXED_SIZE_QUEUE_H_
-

Source/Core/Common/Hash.h

@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
+#pragma once
-#ifndef _HASH_H_
-#define _HASH_H_
 
 #include "Common.h"
 
@@ -17,4 +15,3 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples);
 u64 GetMurmurHash3(const u8 *src, int len, u32 samples);
 u64 GetHash64(const u8 *src, int len, u32 samples);
 void SetHash64Function(bool useHiresTextures);
-#endif // _HASH_H_

Source/Core/Common/IniFile.h

@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
+#pragma once
-#ifndef _INIFILE_H_
-#define _INIFILE_H_
 
 #include <map>
 #include <string>
@@ -159,5 +157,3 @@ private:
 	std::string* GetLine(const char* section, const char* key);
 	void CreateSection(const char* section);
 };
-
-#endif // _INIFILE_H_

Source/Core/Common/LinearDiskCache.h

@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
+#pragma once
-#ifndef _LINEAR_DISKCACHE
-#define _LINEAR_DISKCACHE
 
 #include "Common.h"
 #include <fstream>
@@ -184,5 +182,3 @@ private:
 	std::fstream m_file;
 	u32 m_num_entries;
 };
-
-#endif  // _LINEAR_DISKCACHE

Source/Core/Common/Log.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _LOG_H_
+#pragma once
-#define _LOG_H_
 
 #define NOTICE_LEVEL  1  // VERY important information that is NOT errors. Like startup and OSReports.
 #define ERROR_LEVEL   2  // Critical errors
@@ -155,5 +154,3 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type,
 #else // GEKKO
 #define _assert_msg_(_t_, _a_, _fmt_, ...)
 #endif
-
-#endif // _LOG_H_

Source/Core/Common/LogManager.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _LOGMANAGER_H_
+#pragma once
-#define _LOGMANAGER_H_
 
 #include "Log.h"
 #include "StringUtil.h"
@@ -165,5 +164,3 @@ public:
 	static void Init();
 	static void Shutdown();
 };
-
-#endif // _LOGMANAGER_H_

Source/Core/Common/MathUtil.h

@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
+#pragma once
-#ifndef _MATH_UTIL_H_
-#define _MATH_UTIL_H_
 
 #include "Common.h"
 
@@ -206,5 +204,3 @@ public:
 
 	float data[16];
 };
-
-#endif // _MATH_UTIL_H_

Source/Core/Common/MemArena.h

@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
+#pragma once
-#ifndef _MEMARENA_H_
-#define _MEMARENA_H_
 
 #ifdef _WIN32
 #include <windows.h>
@@ -54,5 +52,3 @@ struct MemoryView
 // a passed-in list of MemoryView structures.
 u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena *arena);
 void MemoryMap_Shutdown(const MemoryView *views, int num_views, u32 flags, MemArena *arena);
-
-#endif // _MEMARENA_H_

Source/Core/Common/MemoryUtil.h

@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
+#pragma once
-#ifndef _MEMORYUTIL_H
-#define _MEMORYUTIL_H
 
 #include <string>
 
@@ -22,5 +20,3 @@ void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute = false);
 std::string MemUsage();
 
 inline int GetPageSize() { return 4096; }
-
-#endif

Source/Core/Common/MsgHandler.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _MSGHANDLER_H_
+#pragma once
-#define _MSGHANDLER_H_
 
 #include <string>
 
@@ -69,5 +68,3 @@ void SetEnableAlert(bool enable);
 	#define AskYesNoT(format, ...) ;
 	#define CriticalAlertT(format, ...) ;
 #endif
-
-#endif // _MSGHANDLER_H_

Source/Core/Common/NandPaths.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef __NANDPATHS_H__
+#pragma once
-#define __NANDPATHS_H__
 
 #include <string>
 #include "CommonTypes.h"
@@ -23,5 +22,3 @@ namespace Common
 	bool CheckTitleTIK(u64 _titleID);
 	void ReadReplacements(replace_v& replacements);
 }
-#endif
-

Source/Core/Common/SDCardUtil.h

@@ -1,19 +1,8 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// This program is free software: you can redistribute it and/or modify
+#pragma once
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official Git repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
 
 #include "CommonTypes.h"
 

Source/Core/Common/StdConditionVariable.h

@@ -1,6 +1,8 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-#ifndef CONDITION_VARIABLE_H_
+#pragma once
-#define CONDITION_VARIABLE_H_
 
 #define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
 #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
@@ -172,4 +174,3 @@ private:
 }
 
 #endif
-#endif

Source/Core/Common/StdMutex.h

@@ -1,6 +1,8 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-#ifndef MUTEX_H_
+#pragma once
-#define MUTEX_H_
 
 #define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
 #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
@@ -368,4 +370,3 @@ void swap(unique_lock<Mutex>& x, unique_lock<Mutex>& y)
 }
 
 #endif
-#endif

Source/Core/Common/StdThread.h

@@ -1,6 +1,8 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-#ifndef STD_THREAD_H_
+#pragma once
-#define STD_THREAD_H_
 
 #define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
 #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
@@ -320,4 +322,3 @@ inline thread::id get_id()
 #undef THREAD_HANDLE
 
 #endif
-#endif

Source/Core/Common/StringUtil.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _STRINGUTIL_H_
+#pragma once
-#define _STRINGUTIL_H_
 
 #include <stdarg.h>
 
@@ -114,5 +113,3 @@ inline std::string UTF8ToTStr(const std::string& str)
 #endif
 
 #endif
-
-#endif // _STRINGUTIL_H_

Source/Core/Common/SymbolDB.h

@@ -5,8 +5,7 @@
 // This file contains a generic symbol map implementation. For CPU-specific
 // magic, derive and extend.
 
-#ifndef _SYMBOL_DB_H
+#pragma once
-#define _SYMBOL_DB_H
 
 #include <string>
 #include <map>
@@ -105,5 +104,3 @@ public:
 	void List();
 	void Index();
 };
-
-#endif

Source/Core/Common/SysConf.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef __SYSCONF_MANAGER_h__
+#pragma once
-#define __SYSCONF_MANAGER_h__
 
 #include <string>
 #include <vector>
@@ -176,5 +175,3 @@ private:
 	std::vector<SSysConfEntry> m_Entries;
 	bool m_IsValid;
 };
-
-#endif // __SYSCONF_MANAGER_h__

Source/Core/Common/Thread.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _THREAD_H_
+#pragma once
-#define _THREAD_H_
 
 #include "StdConditionVariable.h"
 #include "StdMutex.h"
@@ -122,5 +121,3 @@ inline void YieldCPU()
 void SetCurrentThreadName(const char *name);
 
 } // namespace Common
-
-#endif // _THREAD_H_

Source/Core/Common/Timer.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _TIMER_H_
+#pragma once
-#define _TIMER_H_
 
 #include "CommonTypes.h"
 #include <string>
@@ -42,5 +41,3 @@ private:
 };
 
 } // Namespace Common
-
-#endif // _TIMER_H_

Source/Core/Common/x64ABI.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _JIT_ABI_H_
+#pragma once
-#define _JIT_ABI_H_
 
 #include "Common.h"
 
@@ -76,7 +75,3 @@
 #endif // WIN32
 
 #endif // X86
-
-#endif  // _JIT_ABI_H_
-
-

Source/Core/Common/x64Analyzer.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _X64ANALYZER_H_
+#pragma once
-#define _X64ANALYZER_H_
 
 #include "CommonTypes.h"
 
@@ -40,5 +39,3 @@ enum AccessType
 };
 
 bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info);
-
-#endif // _X64ANALYZER_H_

Source/Core/Common/x64Emitter.h

@@ -4,8 +4,7 @@
 
 // WARNING - THIS LIBRARY IS NOT THREAD SAFE!!!
 
-#ifndef _DOLPHIN_INTEL_CODEGEN_
+#pragma once
-#define _DOLPHIN_INTEL_CODEGEN_
 
 #include "Common.h"
 #include "MemoryUtil.h"
@@ -774,5 +773,3 @@ public:
 };
 
 }  // namespace
-
-#endif // _DOLPHIN_INTEL_CODEGEN_

Source/Core/Core/ARDecrypt.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ARDECRYPT_H_
+#pragma once
-#define _ARDECRYPT_H_
 
 #include <vector>
 #include "Common.h"
@@ -15,5 +14,3 @@ namespace ActionReplay
 void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry> &ops);
 
 } //namespace
-
-#endif //_ARDECRYPT_H_

Source/Core/Core/ActionReplay.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ACTIONREPLAY_H_
+#pragma once
-#define _ACTIONREPLAY_H_
 
 #include "IniFile.h"
 
@@ -38,5 +37,3 @@ void EnableSelfLogging(bool enable);
 const std::vector<std::string> &GetSelfLog();
 bool IsSelfLogging();
 }  // namespace
-
-#endif // _ACTIONREPLAY_H_

Source/Core/Core/Boot/Boot.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _BOOT_H
+#pragma once
-#define _BOOT_H
 
 #include <cstdlib>
 #include <string>
@@ -58,5 +57,3 @@ private:
 
 	static bool SetupWiiMemory(IVolume::ECountry country);
 };
-
-#endif

Source/Core/Core/Boot/Boot_DOL.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _BOOT_DOL_H
+#pragma once
-#define _BOOT_DOL_H
 
 #include "CommonTypes.h"
 
@@ -53,5 +52,3 @@ private:
 	// Copy sections to internal buffers
 	void Initialize(u8* _pBuffer, u32 _Size);
 };
-
-#endif

Source/Core/Core/Boot/Boot_WiiWAD.h

@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2014 Dolphin Emulator Project
-
+// Licensed under GPLv2
-// This program is free software: you can redistribute it and/or modify
+// Refer to the license.txt file included.
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
 
 #pragma once
 

Source/Core/Core/Boot/ElfReader.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ELFREADER_H
+#pragma once
-#define _ELFREADER_H
 
 #include "ElfTypes.h"
 
@@ -74,6 +73,3 @@ public:
 		return bRelocate;
 	}
 };
-
-#endif
-

Source/Core/Core/Boot/ElfTypes.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ELFTYPES_H
+#pragma once
-#define _ELFTYPES_H
 
 // ELF Header Constants
 
@@ -280,6 +279,3 @@ struct Elf32_Dyn
 		Elf32_Addr d_ptr;
 	} d_un;
 };
-
-#endif
-

Source/Core/Core/BootManager.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _BOOTMANAGER_H
+#pragma once
-#define _BOOTMANAGER_H
 
 #include <string>
 
@@ -15,5 +14,3 @@ bool BootCore(const std::string& _rFilename);
 
 void Stop();
 };
-
-#endif

Source/Core/Core/ConfigManager.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _CONFIGMANAGER_H
+#pragma once
-#define _CONFIGMANAGER_H
 
 #include <string>
 #include <vector>
@@ -104,6 +103,3 @@ private:
 
 	static SConfig* m_Instance;
 };
-
-#endif // endif config manager
-

Source/Core/Core/Console.h

@@ -5,10 +5,6 @@
 
 // Simple debugging console currently residing in the Logging window. Not used much.
 
-#ifndef _CONSOLE_H
+#pragma once
-#define _CONSOLE_H
 
 void Console_Submit(const char *cmd);
-
-#endif
-

Source/Core/Core/Core.h

@@ -9,8 +9,7 @@
 // This is another part of the emu that needs cleaning - Core.cpp really has
 // too much random junk inside.
 
-#ifndef _CORE_H
+#pragma once
-#define _CORE_H
 
 #include <vector>
 #include <string>
@@ -87,6 +86,3 @@ void UpdateTitle();
 bool PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
 
 }  // namespace
-
-#endif
-

Source/Core/Core/CoreParameter.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _COREPARAMETER_H
+#pragma once
-#define _COREPARAMETER_H
 
 #include "IniFile.h"
 #include <string>
@@ -213,5 +212,3 @@ struct SCoreStartupParameter
 	IniFile LoadLocalGameIni() const;
 	IniFile LoadGameIni() const;
 };
-
-#endif

Source/Core/Core/CoreTiming.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _CORETIMING_H
+#pragma once
-#define _CORETIMING_H
 
 // This is a system to schedule events into the emulated machine's future. Time is measured
 // in main CPU clock cycles.
@@ -84,5 +83,3 @@ extern int downcount;
 extern int slicelength;
 
 }; // end of namespace
-
-#endif

Source/Core/Core/DSP/DSPAccelerator.h

@@ -2,12 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DSP_ACCELERATOR_H
+#pragma once
-#define _DSP_ACCELERATOR_H
 
 u16 dsp_read_accelerator();
 
 u16 dsp_read_aram_d3();
 void dsp_write_aram_d3(u16 value);
-
-#endif

Source/Core/Core/DSP/DSPAnalyzer.h

@@ -2,13 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
+#pragma once
-// Basic code analysis.
 
 #include "DSPInterpreter.h"
 
-namespace DSPAnalyzer {
+// Basic code analysis.
-
+namespace DSPAnalyzer
+{
 #define ISPACE 65536
 
 // Useful things to detect:

Source/Core/Core/DSP/DSPBreakpoints.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DSP_BREAKPOINTS
+#pragma once
-#define _DSP_BREAKPOINTS
 
 #include "Common.h"
 
@@ -60,5 +59,3 @@ public:
 private:
 	u8 b[65536];
 };
-
-#endif

Source/Core/Core/DSP/DSPCodeUtil.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DSPCODEUTIL_H
+#pragma once
-#define _DSPCODEUTIL_H
 
 #include <string>
 #include <vector>
@@ -26,5 +25,3 @@ void BinaryStringBEToCode(const std::string &str, std::vector<u16> &code);
 // Load code (big endian binary).
 bool LoadBinary(const char *filename, std::vector<u16> &code);
 bool SaveBinary(const std::vector<u16> &code, const char *filename);
-
-#endif  // _DSPCODEUTIL_H

Source/Core/Core/DSP/DSPCommon.h

@@ -2,10 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef __DSPCOMMON_H
+#pragma once
-#define __DSPCOMMON_H
 
 #include "CommonTypes.h"
 typedef u16 UDSPInstruction;
-
-#endif

Source/Core/Core/DSP/DSPCore.h

@@ -23,8 +23,7 @@
 
    ====================================================================*/
 
-#ifndef _DSPCORE_H
+#pragma once
-#define _DSPCORE_H
 
 #include "Thread.h"
 
@@ -301,5 +300,3 @@ void DSPCore_Step();
 
 u16 DSPCore_ReadRegister(int reg);
 void DSPCore_WriteRegister(int reg, u16 val);
-
-#endif // _DSPCORE_H

Source/Core/Core/DSP/DSPEmitter.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DSPEMITTER_H
+#pragma once
-#define _DSPEMITTER_H
 
 #include <list>
 
@@ -286,7 +285,3 @@ private:
 	void get_ax_h(int _reg, Gen::X64Reg acc = Gen::EAX);
 	void get_long_acc(int _reg, Gen::X64Reg acc = Gen::EAX);
 };
-
-
-#endif // _DSPEMITTER_H
-

Source/Core/Core/DSP/DSPHWInterface.h

@@ -23,8 +23,7 @@
 
    ====================================================================*/
 
-#ifndef _GDSP_INTERFACE_H
+#pragma once
-#define _GDSP_INTERFACE_H
 
 #include "Common.h"
 
@@ -41,5 +40,3 @@ void gdsp_ifx_init();
 
 void gdsp_ifx_write(u32 addr, u32 val);
 u16  gdsp_ifx_read(u16 addr);
-
-#endif

Source/Core/Core/DSP/DSPHost.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DSPHOST_H
+#pragma once
-#define _DSPHOST_H
 
 // The user of the DSPCore library must supply a few functions so that the
 // emulation core can access the environment it runs in. If the emulation
@@ -18,5 +17,3 @@ bool DSPHost_Wii();
 void DSPHost_InterruptRequest();
 void DSPHost_CodeLoaded(const u8 *ptr, int size);
 void DSPHost_UpdateDebugger();
-
-#endif

Source/Core/Core/DSP/DSPIntCCUtil.h

@@ -4,8 +4,7 @@
 //
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-#ifndef _GDSP_CONDITION_CODES_H
+#pragma once
-#define _GDSP_CONDITION_CODES_H
 
 // Anything to do with SR and conditions goes here.
 
@@ -38,5 +37,3 @@ inline bool isOverS32(s64 acc) {
 }
 
 }  // namespace
-
-#endif  // _GDSP_CONDITION_CODES_H

Source/Core/Core/DSP/DSPIntExtOps.h

@@ -23,8 +23,7 @@
 
    ====================================================================*/
 
-#ifndef _GDSP_EXT_OP_H
+#pragma once
-#define _GDSP_EXT_OP_H
 
 #include "DSPTables.h"
 
@@ -64,5 +63,3 @@ void nop(const UDSPInstruction opc);
 
 } // end namespace Ext
 } // end namespace DSPinterpeter
-
-#endif

Source/Core/Core/DSP/DSPIntUtil.h

@@ -23,8 +23,7 @@
 
    ====================================================================*/
 
-#ifndef _DSP_INT_UTIL_H
+#pragma once
-#define _DSP_INT_UTIL_H
 
 #include "Common.h"
 
@@ -381,5 +380,3 @@ inline s16 dsp_get_ax_h(int _reg)
 {
 	return (s16)g_dsp.r.ax[_reg].h;
 }
-
-#endif

Source/Core/Core/DSP/DSPInterpreter.h

@@ -2,15 +2,14 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DSPINTERPRETER_H
+#pragma once
-#define _DSPINTERPRETER_H
 
 #include "DSPTables.h"
 
 #define DSP_REG_MASK    0x1f
 
-namespace DSPInterpreter {
+namespace DSPInterpreter
-
+{
 void Step();
 
 // See: DspIntBranch.cpp
@@ -152,5 +151,3 @@ void tstprod(const UDSPInstruction opc);
 void abs(const UDSPInstruction opc);
 
 }  // namespace
-
-#endif // _DSPINTERPRETER_H

Source/Core/Core/DSP/DSPMemoryMap.h

@@ -23,8 +23,7 @@
 
    ====================================================================*/
 
-#ifndef _GDSP_MEMORY_H
+#pragma once
-#define _GDSP_MEMORY_H
 
 #include "Common.h"
 #include "DSPInterpreter.h"
@@ -51,5 +50,3 @@ inline void dsp_skip_inst()
 {
 	g_dsp.pc += opTable[dsp_peek_code()]->size;
 }
-
-#endif

Source/Core/Core/DSP/DSPStacks.h

@@ -23,12 +23,9 @@
 
    ====================================================================*/
 
-#ifndef _DSP_STACKS_H
+#pragma once
-#define _DSP_STACKS_H
 
 #include "Common.h"
 
 void dsp_reg_store_stack(int stack_reg, u16 val);
 u16 dsp_reg_load_stack(int stack_reg);
-
-#endif

Source/Core/Core/DSP/DSPTables.h

@@ -4,8 +4,7 @@
 
 // Additional copyrights go to Duddie (c) 2005 (duddie@walla.com)
 
-#ifndef _DSPTABLES_H
+#pragma once
-#define _DSPTABLES_H
 
 //nclude "Common.h"
 #include "DSPEmitter.h"
@@ -145,5 +144,3 @@ inline void ExecuteInstruction(const UDSPInstruction inst)
 		applyWriteBackLog();
 	}
 }
-
-#endif // _DSPTABLES_H

Source/Core/Core/DSP/Jit/DSPJitRegCache.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DSPJITREGCACHE_H
+#pragma once
-#define _DSPJITREGCACHE_H
 
 #include "x64Emitter.h"
 
@@ -186,5 +185,3 @@ public:
 	//unreserve the given host reg
 	void putXReg(Gen::X64Reg reg);
 };
-
-#endif /*_DSPJITREGCACHE_H*/

Source/Core/Core/DSP/Jit/DSPJitUtil.h

@@ -2,7 +2,4 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef __DSPJITUTIL_H__
+#pragma once
-#define __DSPJITUTIL_H__
-
-#endif /*__DSPJITUTIL_H__*/

Source/Core/Core/DSP/LabelMap.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _LABELMAP_H
+#pragma once
-#define _LABELMAP_H
 
 #include <string>
 #include <vector>
@@ -38,5 +37,3 @@ public:
 	bool GetLabelValue(const std::string &label, u16 *value, LabelType type = LABEL_ANY) const;
 	void Clear();
 };
-
-#endif  // _LABELMAP_H

Source/Core/Core/DSP/assemble.h

@@ -22,8 +22,7 @@
 
    ====================================================================*/
 
-#ifndef _DSP_ASSEMBLE_H
+#pragma once
-#define _DSP_ASSEMBLE_H
 
 #include <string>
 #include <map>
@@ -135,5 +134,3 @@ private:
 	int m_current_param;
 	const AssemblerSettings settings_;
 };
-
-#endif  // _DSP_ASSEMBLE_H

Source/Core/Core/DSP/disassemble.h

@@ -22,8 +22,7 @@
 
    ====================================================================*/
 
-#ifndef _DSP_DISASSEMBLE_H
+#pragma once
-#define _DSP_DISASSEMBLE_H
 
 #include <map>
 #include <vector>
@@ -82,6 +81,3 @@ private:
 
 	LabelMap labels;
 };
-
-#endif  // _DSP_DISASSEMBLE_H
-

Source/Core/Core/DSPEmulator.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DSPEMULATOR_H_
+#pragma once
-#define _DSPEMULATOR_H_
 
 #include "ChunkFile.h"
 #include "SoundStream.h"
@@ -39,5 +38,3 @@ protected:
 };
 
 DSPEmulator *CreateDSPEmulator(bool HLE);
-
-#endif // _DSPEMULATOR_H_

Source/Core/Core/Debugger/Debugger_SymbolMap.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DEBUGGER_SYMBOLMAP_H
+#pragma once
-#define _DEBUGGER_SYMBOLMAP_H
 
 #include <vector>
 #include <string>
@@ -27,6 +26,3 @@ void AddAutoBreakpoints();
 
 
 } // end of namespace Debugger
-
-#endif
-

Source/Core/Core/Debugger/Dump.h

@@ -6,8 +6,7 @@
 // Purpose: uncompress the dumps from costis GC-Debugger tool
 //
 //
-#ifndef _DUMP_H
+#pragma once
-#define _DUMP_H
 
 #include "Common.h"
 
@@ -36,5 +35,3 @@ private:
 
 	u32 Read32(u32 _pos);
 };
-
-#endif

Source/Core/Core/Debugger/GCELF.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef GCELF_H
+#pragma once
-#define GCELF_H
 
 // ELF File Types
 #define ET_NONE			0 // No file type
@@ -111,6 +110,3 @@ typedef struct
 } Rela_Header;
 
 const char ELFID[4] = {0x7F, 'E', 'L', 'F'};
-
-#endif
-

Source/Core/Core/Debugger/PPCDebugInterface.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _PPCDEBUGINTERFACE_H
+#pragma once
-#define _PPCDEBUGINTERFACE_H
 
 #include <string>
 
@@ -43,6 +42,3 @@ public:
 	virtual std::string getDescription(unsigned int address) override;
 	virtual void showJitResults(u32 address) override;
 };
-
-#endif
-

Source/Core/Core/FifoPlayer/FifoAnalyzer.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _FIFOANALYZER_H
+#pragma once
-#define _FIFOANALYZER_H
 
 #include "Common.h"
 
@@ -37,5 +36,3 @@ namespace FifoAnalyzer
 	u32 CalculateVertexSize(int vatIndex, const CPMemory &cpMem);
 	void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMem);
 }
-
-#endif

Source/Core/Core/FifoPlayer/FifoDataFile.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _FIFODATAFILE_H_
+#pragma once
-#define _FIFODATAFILE_H_
 
 #include "Common.h"
 #include <vector>
@@ -95,5 +94,3 @@ private:
 
 	std::vector<FifoFrameInfo> m_Frames;
 };
-
-#endif

Source/Core/Core/FifoPlayer/FifoFileStruct.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _FIFOFILESTRUCT_H_
+#pragma once
-#define _FIFOFILESTRUCT_H_
 
 #include "Common.h"
 
@@ -68,5 +67,3 @@ struct FileMemoryUpdate
 #pragma pack(pop)
 
 }
-
-#endif

Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h

@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _FIFOPLAYBACKANALYZER_H_
+#pragma once
-#define _FIFOPLAYBACKANALYZER_H_
 
 #include "FifoAnalyzer.h"
 #include "FifoDataFile.h"
@@ -47,5 +46,3 @@ private:
 	BPMemory m_BpMem;
 	FifoAnalyzer::CPMemory m_CpMem;
 };
-
-#endif