diff --git a/src/animation/AnimBlendAssocGroup.h b/src/animation/AnimBlendAssocGroup.h
index 86f0ca18..31e00163 100644
--- a/src/animation/AnimBlendAssocGroup.h
+++ b/src/animation/AnimBlendAssocGroup.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ANIMBLENDASSOCGROUP_H__
+#define __GTA_ANIMBLENDASSOCGROUP_H__
 
 class CAnimBlendAssociation;
 struct CAnimBlock;
@@ -22,3 +23,5 @@ public:
 	void CreateAssociations(const char *name);
 	void CreateAssociations(const char *blockName, RpClump *clump, const char **animNames, int numAssocs);
 };
+
+#endif // __GTA_ANIMBLENDASSOCGROUP_H__
diff --git a/src/animation/AnimBlendAssociation.h b/src/animation/AnimBlendAssociation.h
index dbfcb722..e6b91a2a 100644
--- a/src/animation/AnimBlendAssociation.h
+++ b/src/animation/AnimBlendAssociation.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ANIMBLENDASSOCIATION_H__
+#define __GTA_ANIMBLENDASSOCIATION_H__
 
 #include "AnimBlendList.h"
 #include "AnimBlendNode.h"
@@ -91,3 +92,5 @@ public:
 		return (CAnimBlendAssociation*)((uint8*)l - offsetof(CAnimBlendAssociation, link));
 	}
 };
+
+#endif // __GTA_ANIMBLENDASSOCIATION_H__
diff --git a/src/animation/AnimBlendClumpData.h b/src/animation/AnimBlendClumpData.h
index bb711b28..07e5bf28 100644
--- a/src/animation/AnimBlendClumpData.h
+++ b/src/animation/AnimBlendClumpData.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ANIMBLENDCLUMPDATA_H__
+#define __GTA_ANIMBLENDCLUMPDATA_H__
 
 #include "AnimBlendList.h"
 
@@ -43,3 +44,5 @@ public:
 	void SetNumberOfBones(int n) { SetNumberOfFrames(n); }
 	void ForAllFrames(void (*cb)(AnimBlendFrameData*, void*), void *arg);
 };
+
+#endif // __GTA_ANIMBLENDCLUMPDATA_H__
diff --git a/src/animation/AnimBlendHierarchy.h b/src/animation/AnimBlendHierarchy.h
index 4838c4f8..e3f91658 100644
--- a/src/animation/AnimBlendHierarchy.h
+++ b/src/animation/AnimBlendHierarchy.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ANIMBLENDHIERARCHY_H__
+#define __GTA_ANIMBLENDHIERARCHY_H__
 
 #include "templates.h"
 
@@ -33,4 +34,6 @@ public:
 	bool IsCompressed() { return !!compressed; };
 };
 
-VALIDATE_SIZE(CAnimBlendHierarchy, 0x28);
\ No newline at end of file
+VALIDATE_SIZE(CAnimBlendHierarchy, 0x28);
+
+#endif // __GTA_ANIMBLENDHIERARCHY_H__
diff --git a/src/animation/AnimBlendList.h b/src/animation/AnimBlendList.h
index 018b5988..515562e6 100644
--- a/src/animation/AnimBlendList.h
+++ b/src/animation/AnimBlendList.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ANIMBLENDLIST_H__
+#define __GTA_ANIMBLENDLIST_H__
 
 // name made up
 class CAnimBlendLink
@@ -26,3 +27,5 @@ public:
 		Init();
 	}
 };
+
+#endif // __GTA_ANIMBLENDLIST_H__
diff --git a/src/animation/AnimBlendNode.h b/src/animation/AnimBlendNode.h
index 99a657ac..ac25eecf 100644
--- a/src/animation/AnimBlendNode.h
+++ b/src/animation/AnimBlendNode.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ANIMBLENDNODE_H__
+#define __GTA_ANIMBLENDNODE_H__
 
 #include "AnimBlendSequence.h"
 
@@ -35,3 +36,5 @@ public:
 
 
 VALIDATE_SIZE(CAnimBlendNode, 0x1C);
+
+#endif // __GTA_ANIMBLENDNODE_H__
diff --git a/src/animation/AnimBlendSequence.h b/src/animation/AnimBlendSequence.h
index 67118b2f..06951df1 100644
--- a/src/animation/AnimBlendSequence.h
+++ b/src/animation/AnimBlendSequence.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ANIMBLENDSEQUENCE_H__
+#define __GTA_ANIMBLENDSEQUENCE_H__
 
 #include "Quaternion.h"
 
@@ -93,3 +94,5 @@ public:
 	void SetBoneTag(int tag) { boneTag = tag; }
 };
 VALIDATE_SIZE(CAnimBlendSequence, 0x30);
+
+#endif // __GTA_ANIMBLENDSEQUENCE_H__
diff --git a/src/animation/AnimManager.h b/src/animation/AnimManager.h
index 213326b6..96fd1327 100644
--- a/src/animation/AnimManager.h
+++ b/src/animation/AnimManager.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ANIMMANAGER_H__
+#define __GTA_ANIMMANAGER_H__
 
 #include "AnimBlendHierarchy.h"
 #include "AnimationId.h"
@@ -143,3 +144,5 @@ public:
 	static void RemoveLastAnimFile(void);
 	static CAnimBlendAssocGroup* GetAnimAssocGroups(void) { return ms_aAnimAssocGroups; }
 };
+
+#endif // __GTA_ANIMMANAGER_H__
diff --git a/src/animation/AnimationId.h b/src/animation/AnimationId.h
index 0b5d8d8e..4a5be765 100644
--- a/src/animation/AnimationId.h
+++ b/src/animation/AnimationId.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ANIMATIONID_H__
+#define __GTA_ANIMATIONID_H__
 
 enum AnimationId
 {
@@ -284,4 +285,6 @@ enum AnimationId
 	ANIM_STRIP_E,
 	ANIM_STRIP_F,
 	ANIM_STRIP_G,
-};
\ No newline at end of file
+};
+
+#endif // __GTA_ANIMATIONID_H__
diff --git a/src/animation/Bones.h b/src/animation/Bones.h
index e133fd7f..8426ccb7 100644
--- a/src/animation/Bones.h
+++ b/src/animation/Bones.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_BONES_H__
+#define __GTA_BONES_H__
 
 enum BoneTag
 {
@@ -28,3 +29,5 @@ enum BoneTag
 
 int ConvertPedNode2BoneTag(int node);
 const char *ConvertBoneTag2BoneName(int tag);
+
+#endif // __GTA_BONES_H__
diff --git a/src/animation/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp
index 633618b1..9984e020 100644
--- a/src/animation/CutsceneMgr.cpp
+++ b/src/animation/CutsceneMgr.cpp
@@ -680,4 +680,4 @@ CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver()
 
 	pPlayerPed->ClearWeapons();
 	CGame::DrasticTidyUpMemory(true);
-}
\ No newline at end of file
+}
diff --git a/src/animation/CutsceneMgr.h b/src/animation/CutsceneMgr.h
index 51ef6c04..f81082c0 100644
--- a/src/animation/CutsceneMgr.h
+++ b/src/animation/CutsceneMgr.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CUTSCENEMGR_H__
+#define __GTA_CUTSCENEMGR_H__
 #include "CutsceneObject.h"
 
 #define CUTSCENENAMESIZE 8
@@ -59,3 +60,5 @@ public:
 	static void RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver();
 	static void DisableCutsceneShadows() { ms_useCutsceneShadows = false; }
 };
+
+#endif // __GTA_CUTSCENEMGR_H__
diff --git a/src/animation/RpAnimBlend.h b/src/animation/RpAnimBlend.h
index 6e9e0f0f..4e979b51 100644
--- a/src/animation/RpAnimBlend.h
+++ b/src/animation/RpAnimBlend.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RPANIMBLEND_H__
+#define __GTA_RPANIMBLEND_H__
 
 class CAnimBlendNode;
 class CAnimBlendAssociation;
@@ -46,3 +47,5 @@ void FrameUpdateCallBackOffscreen(AnimBlendFrameData *frame, void *arg);
 
 void FrameUpdateCallBackNonSkinnedCompressed(AnimBlendFrameData *frame, void *arg);
 void FrameUpdateCallBackSkinnedCompressed(AnimBlendFrameData *frame, void *arg);
+
+#endif // __GTA_RPANIMBLEND_H__
diff --git a/src/audio/AudioCollision.h b/src/audio/AudioCollision.h
index 31be0334..b2853216 100644
--- a/src/audio/AudioCollision.h
+++ b/src/audio/AudioCollision.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_AUDIOCOLLISION_H__
+#define __GTA_AUDIOCOLLISION_H__
 
 #define NUMAUDIOCOLLISIONS 10
 
@@ -55,3 +56,5 @@ public:
 };
 
 VALIDATE_SIZE(cAudioCollisionManager, 0x354);
+
+#endif // __GTA_AUDIOCOLLISION_H__
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 49edcfec..84637e8f 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_AUDIOMANAGER_H__
+#define __GTA_AUDIOMANAGER_H__
 
 #include "audio_enums.h"
 #include "AudioCollision.h"
@@ -647,3 +648,5 @@ enum
 	PED_COMMENT_VOLUME_BEHIND_WALL = 31,
 	COLLISION_MAX_DIST = 60,
 };
+
+#endif // __GTA_AUDIOMANAGER_H__
diff --git a/src/audio/AudioSamples.h b/src/audio/AudioSamples.h
index 365ca282..7f652c15 100644
--- a/src/audio/AudioSamples.h
+++ b/src/audio/AudioSamples.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_AUDIOSAMPLES_H__
+#define __GTA_AUDIOSAMPLES_H__
 
 #include "common.h"
 
@@ -10128,3 +10129,5 @@ enum eSfxSample
 	SAMPLEBANK_PED_END = SFX_PLAYER_ON_FIRE_16,
 	SAMPLEBANK_PED_MAX = SAMPLEBANK_PED_END + 1,
 };
+
+#endif // __GTA_AUDIOSAMPLES_H__
diff --git a/src/audio/AudioScriptObject.h b/src/audio/AudioScriptObject.h
index b9a7e61b..2f05f7f4 100644
--- a/src/audio/AudioScriptObject.h
+++ b/src/audio/AudioScriptObject.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_AUDIOSCRIPTOBJECT_H__
+#define __GTA_AUDIOSCRIPTOBJECT_H__
 
 class cAudioScriptObject
 {
@@ -23,4 +24,6 @@ public:
 
 VALIDATE_SIZE(cAudioScriptObject, 20);
 
-extern void PlayOneShotScriptObject(uint8 id, CVector const &pos);
\ No newline at end of file
+extern void PlayOneShotScriptObject(uint8 id, CVector const &pos);
+
+#endif // __GTA_AUDIOSCRIPTOBJECT_H__
diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp
index 68e879e6..9c90ad72 100644
--- a/src/audio/DMAudio.cpp
+++ b/src/audio/DMAudio.cpp
@@ -405,4 +405,4 @@ void
 cDMAudio::ShutUpPlayerTalking(bool8 state)
 {
 	AudioManager.m_bIsPlayerShutUp = state;
-}
\ No newline at end of file
+}
diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h
index 110cb2db..cde73cfd 100644
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DMAUDIO_H__
+#define __GTA_DMAUDIO_H__
 
 #include "audio_enums.h"
 #include "soundlist.h"
@@ -105,3 +106,5 @@ public:
 	void ShutUpPlayerTalking(bool8 state);
 };
 extern cDMAudio DMAudio;
+
+#endif // __GTA_DMAUDIO_H__
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index 52254b19..ae2c3bdd 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MUSICMANAGER_H__
+#define __GTA_MUSICMANAGER_H__
 
 #include "audio_enums.h"
 
@@ -111,3 +112,5 @@ VALIDATE_SIZE(cMusicManager, 0x95C);
 extern cMusicManager MusicManager;
 extern bool8 g_bAnnouncementReadPosAlready; // we have a symbol of this so it was declared in .h
 float GetHeightScale();
+
+#endif // __GTA_MUSICMANAGER_H__
diff --git a/src/audio/PolRadio.h b/src/audio/PolRadio.h
index 55b2c9f7..15eaabe8 100644
--- a/src/audio/PolRadio.h
+++ b/src/audio/PolRadio.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_POLRADIO_H__
+#define __GTA_POLRADIO_H__
 
 #include "Crime.h"
 #include "AudioSamples.h"
@@ -65,3 +66,5 @@ public:
 };
 
 VALIDATE_SIZE(cPoliceRadioQueue, 244);
+
+#endif // __GTA_POLRADIO_H__
diff --git a/src/audio/audio_enums.h b/src/audio/audio_enums.h
index 22b425e7..d8ad7d2d 100644
--- a/src/audio/audio_enums.h
+++ b/src/audio/audio_enums.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_AUDIO_ENUMS_H__
+#define __GTA_AUDIO_ENUMS_H__
 
 enum eRadioStation
 {
@@ -1334,3 +1335,5 @@ enum
 	MISSION_AUDIO_PLAYER_COMMENT,
 	MISSION_AUDIO_COUNT
 };
+
+#endif // __GTA_AUDIO_ENUMS_H__
diff --git a/src/audio/oal/channel.h b/src/audio/oal/channel.h
index 872646c8..38e9f6fa 100644
--- a/src/audio/oal/channel.h
+++ b/src/audio/oal/channel.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CHANNEL_H__
+#define __GTA_CHANNEL_H__
 
 #ifdef AUDIO_OAL
 #include "oal/oal_utils.h"
@@ -52,4 +53,6 @@ public:
 	bool Update();
 };
 
-#endif
\ No newline at end of file
+#endif
+
+#endif // __GTA_CHANNEL_H__
diff --git a/src/audio/oal/oal_utils.cpp b/src/audio/oal/oal_utils.cpp
index e4cb0b77..e296595f 100644
--- a/src/audio/oal/oal_utils.cpp
+++ b/src/audio/oal/oal_utils.cpp
@@ -178,4 +178,4 @@ void EAX3_SetReverbMix(ALuint filter, float mix)
 	alFilterf(filter, AL_LOWPASS_GAINHF, mB_to_gain(mbhf));
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/audio/oal/oal_utils.h b/src/audio/oal/oal_utils.h
index f0fa090a..4cf58cde 100644
--- a/src/audio/oal/oal_utils.h
+++ b/src/audio/oal/oal_utils.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_OAL_UTILS_H__
+#define __GTA_OAL_UTILS_H__
 
 #ifdef AUDIO_OAL
 #include "eax.h"
@@ -52,3 +53,5 @@ extern LPALGETFILTERFV alGetFilterfv;
 using namespace re3_openal;
 
 #endif
+
+#endif // __GTA_OAL_UTILS_H__
diff --git a/src/audio/oal/stream.h b/src/audio/oal/stream.h
index f0456925..d472c603 100644
--- a/src/audio/oal/stream.h
+++ b/src/audio/oal/stream.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_STREAM_H__
+#define __GTA_STREAM_H__
 
 #ifdef AUDIO_OAL
 #include <AL/al.h>
@@ -190,3 +191,5 @@ public:
 };
 
 #endif
+
+#endif // __GTA_STREAM_H__
diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index e585b0d6..e7e6dfb0 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SAMPMAN_H__
+#define __GTA_SAMPMAN_H__
 #include "AudioSamples.h"
 #include "audio_enums.h"
 
@@ -2716,4 +2717,6 @@ static char StreamedNameTable[][25] =
 	"AUDIO\\BUST_26.WAV",
 	"AUDIO\\BUST_27.WAV",
 	"AUDIO\\BUST_28.WAV",
-};
\ No newline at end of file
+};
+
+#endif // __GTA_SAMPMAN_H__
diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h
index c6dbb634..0673f714 100644
--- a/src/audio/soundlist.h
+++ b/src/audio/soundlist.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SOUNDLIST_H__
+#define __GTA_SOUNDLIST_H__
 
 enum eSound
 {
@@ -280,3 +281,5 @@ enum eScriptSounds {
 	SCRIPT_SOUND_TOTAL,
 	SCRIPT_SOUND_INVALID,
 };
+
+#endif // __GTA_SOUNDLIST_H__
diff --git a/src/buildings/Building.h b/src/buildings/Building.h
index f8ddfa46..38aabb19 100644
--- a/src/buildings/Building.h
+++ b/src/buildings/Building.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_BUILDING_H__
+#define __GTA_BUILDING_H__
 
 #include "Entity.h"
 
@@ -18,3 +19,5 @@ public:
 };
 
 bool IsBuildingPointerValid(CBuilding*);
+
+#endif // __GTA_BUILDING_H__
diff --git a/src/buildings/Solid.h b/src/buildings/Solid.h
index 4ca800c2..e419d204 100644
--- a/src/buildings/Solid.h
+++ b/src/buildings/Solid.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SOLID_H__
+#define __GTA_SOLID_H__
 
 #include "Entity.h"
 
@@ -9,4 +10,6 @@ public:
 		m_type = ENTITY_TYPE_BUILDING;
 		bUsesCollision = true;
 	}
-};
\ No newline at end of file
+};
+
+#endif // __GTA_SOLID_H__
diff --git a/src/buildings/Treadable.h b/src/buildings/Treadable.h
index 6a183c63..c2068c13 100644
--- a/src/buildings/Treadable.h
+++ b/src/buildings/Treadable.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TREADABLE_H__
+#define __GTA_TREADABLE_H__
 
 #include "Building.h"
 
@@ -10,3 +11,5 @@ public:
 
 	bool GetIsATreadable(void) { return true; }
 };
+
+#endif // __GTA_TREADABLE_H__
diff --git a/src/collision/ColBox.cpp b/src/collision/ColBox.cpp
index 53cba88b..abb5c1e3 100644
--- a/src/collision/ColBox.cpp
+++ b/src/collision/ColBox.cpp
@@ -18,4 +18,4 @@ CColBox::operator=(const CColBox& other)
 	surface = other.surface;
 	piece = other.piece;
 	return *this;
-}
\ No newline at end of file
+}
diff --git a/src/collision/ColBox.h b/src/collision/ColBox.h
index 0df55925..e8a0dd8c 100644
--- a/src/collision/ColBox.h
+++ b/src/collision/ColBox.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_COLBOX_H__
+#define __GTA_COLBOX_H__
 
 #include "SurfaceTable.h"
 
@@ -19,4 +20,6 @@ struct CColBox : public CBox
 	using CBox::Set;
 
 	CColBox& operator=(const CColBox &other);
-};
\ No newline at end of file
+};
+
+#endif // __GTA_COLBOX_H__
diff --git a/src/collision/ColLine.cpp b/src/collision/ColLine.cpp
index c6247449..d7c36f9d 100644
--- a/src/collision/ColLine.cpp
+++ b/src/collision/ColLine.cpp
@@ -6,4 +6,4 @@ CColLine::Set(const CVector &p0, const CVector &p1)
 {
 	this->p0 = p0;
 	this->p1 = p1;
-}
\ No newline at end of file
+}
diff --git a/src/collision/ColLine.h b/src/collision/ColLine.h
index 21587a06..3f305f2e 100644
--- a/src/collision/ColLine.h
+++ b/src/collision/ColLine.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_COLLINE_H__
+#define __GTA_COLLINE_H__
 
 struct CColLine
 {
@@ -11,4 +12,6 @@ struct CColLine
 	CColLine(void) { };
 	CColLine(const CVector &p0, const CVector &p1) { this->p0 = p0; this->p1 = p1; };
 	void Set(const CVector &p0, const CVector &p1);
-};
\ No newline at end of file
+};
+
+#endif // __GTA_COLLINE_H__
diff --git a/src/collision/ColModel.h b/src/collision/ColModel.h
index 64f05f76..8b313691 100644
--- a/src/collision/ColModel.h
+++ b/src/collision/ColModel.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_COLMODEL_H__
+#define __GTA_COLMODEL_H__
 
 #include "templates.h"
 #include "ColBox.h"
@@ -36,4 +37,6 @@ struct CColModel
 	void *operator new(size_t) throw();
 	void operator delete(void *p, size_t) throw();
 	CColModel& operator=(const CColModel& other);
-};
\ No newline at end of file
+};
+
+#endif // __GTA_COLMODEL_H__
diff --git a/src/collision/ColPoint.h b/src/collision/ColPoint.h
index a15b2345..92b2bc12 100644
--- a/src/collision/ColPoint.h
+++ b/src/collision/ColPoint.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_COLPOINT_H__
+#define __GTA_COLPOINT_H__
 
 struct CColPoint
 {
@@ -32,3 +33,5 @@ struct CColPoint
 	CColPoint &operator=(const CColPoint &other);
 };
 
+
+#endif // __GTA_COLPOINT_H__
diff --git a/src/collision/ColSphere.cpp b/src/collision/ColSphere.cpp
index 65f02860..71852d36 100644
--- a/src/collision/ColSphere.cpp
+++ b/src/collision/ColSphere.cpp
@@ -24,4 +24,4 @@ CColSphere::IntersectRay(CVector const& from, CVector const& dir, CVector &entry
 	entry = from + dir * root1;
 	exit = from + dir * root2;
 	return true;
-}
\ No newline at end of file
+}
diff --git a/src/collision/ColSphere.h b/src/collision/ColSphere.h
index f86b282a..35073875 100644
--- a/src/collision/ColSphere.h
+++ b/src/collision/ColSphere.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_COLSPHERE_H__
+#define __GTA_COLSPHERE_H__
 
 #include "SurfaceTable.h"
 
@@ -18,4 +19,6 @@ struct CColSphere : public CSphere
 	void Set(float radius, const CVector &center, uint8 surf, uint8 piece);
 	bool IntersectRay(CVector const &from, CVector const &dir, CVector &entry, CVector &exit);
 	using CSphere::Set;
-};
\ No newline at end of file
+};
+
+#endif // __GTA_COLSPHERE_H__
diff --git a/src/collision/ColStore.h b/src/collision/ColStore.h
index 8e2a3a70..409efa55 100644
--- a/src/collision/ColStore.h
+++ b/src/collision/ColStore.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_COLSTORE_H__
+#define __GTA_COLSTORE_H__
 
 #include "templates.h"
 
@@ -41,3 +42,5 @@ public:
 		return ms_pColPool->GetSlot(slot);
 	}
 };
+
+#endif // __GTA_COLSTORE_H__
diff --git a/src/collision/ColTriangle.cpp b/src/collision/ColTriangle.cpp
index 843fb93f..67df276d 100644
--- a/src/collision/ColTriangle.cpp
+++ b/src/collision/ColTriangle.cpp
@@ -29,4 +29,4 @@ CColTrianglePlane::Set(const CVector &va, const CVector &vb, const CVector &vc)
 	else
 		dir = normal.z < 0.0f ? DIR_Z_NEG : DIR_Z_POS;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/collision/ColTriangle.h b/src/collision/ColTriangle.h
index a2580c58..2c1c55cf 100644
--- a/src/collision/ColTriangle.h
+++ b/src/collision/ColTriangle.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_COLTRIANGLE_H__
+#define __GTA_COLTRIANGLE_H__
 
 #include "CompressedVector.h"
 
@@ -74,4 +75,6 @@ struct CColTrianglePlane
 	float GetNormalZ() const { return normal.z; }
 	float CalcPoint(const CVector &v) const { return DotProduct(normal, v) - dist; };
 #endif
-};
\ No newline at end of file
+};
+
+#endif // __GTA_COLTRIANGLE_H__
diff --git a/src/collision/Collision.h b/src/collision/Collision.h
index 57f5f86e..c698e58f 100644
--- a/src/collision/Collision.h
+++ b/src/collision/Collision.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_COLLISION_H__
+#define __GTA_COLLISION_H__
 
 #include "ColModel.h"
 #include "Game.h"	// for eLevelName
@@ -66,3 +67,5 @@ public:
 	static float DistToLine(const CVector *l0, const CVector *l1, const CVector *point);
 	static float DistToLine(const CVector *l0, const CVector *l1, const CVector *point, CVector &closest);
 };
+
+#endif // __GTA_COLLISION_H__
diff --git a/src/collision/CompressedVector.h b/src/collision/CompressedVector.h
index d54e49b1..2f28d850 100644
--- a/src/collision/CompressedVector.h
+++ b/src/collision/CompressedVector.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_COMPRESSEDVECTOR_H__
+#define __GTA_COMPRESSEDVECTOR_H__
 
 struct CompressedVector
 {
@@ -33,4 +34,6 @@ struct CompressedVector
 	CVector Get(void) const { return CVector(x, y, z); };
 	void Set(float x, float y, float z) { this->x = x; this->y = y; this->z = z; };
 #endif
-};
\ No newline at end of file
+};
+
+#endif // __GTA_COMPRESSEDVECTOR_H__
diff --git a/src/collision/TempColModels.h b/src/collision/TempColModels.h
index 1a888723..96ad7f59 100644
--- a/src/collision/TempColModels.h
+++ b/src/collision/TempColModels.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TEMPCOLMODELS_H__
+#define __GTA_TEMPCOLMODELS_H__
 
 #include "ColModel.h"
 
@@ -22,3 +23,5 @@ public:
 
 	static void Initialise(void);
 };
+
+#endif // __GTA_TEMPCOLMODELS_H__
diff --git a/src/collision/VuCollision.cpp b/src/collision/VuCollision.cpp
index 8828d2e1..60f26e6f 100644
--- a/src/collision/VuCollision.cpp
+++ b/src/collision/VuCollision.cpp
@@ -279,4 +279,4 @@ SphereToTriangleCollisionCompressed(const CVuVector &sph, VuTriangle &tri)
 	SphereToTriangleCollision(sph, v0, v1, v2, plane);
 #endif
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/collision/VuCollision.h b/src/collision/VuCollision.h
index 29ca4cbf..8fa58788 100644
--- a/src/collision/VuCollision.h
+++ b/src/collision/VuCollision.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_VUCOLLISION_H__
+#define __GTA_VUCOLLISION_H__
 
 
 struct VuTriangle
@@ -30,3 +31,5 @@ void LineToTriangleCollisionCompressed(const CVuVector &p0, const CVuVector &p1,
 void SphereToTriangleCollision(const CVuVector &sph, const CVuVector &v0, const CVuVector &v1, const CVuVector &v2, const CVuVector &plane);
 void SphereToTriangleCollisionCompressed(const CVuVector &sph, VuTriangle &tri);
 }
+
+#endif // __GTA_VUCOLLISION_H__
diff --git a/src/control/AutoPilot.cpp b/src/control/AutoPilot.cpp
index d7c17a68..b5a3a08d 100644
--- a/src/control/AutoPilot.cpp
+++ b/src/control/AutoPilot.cpp
@@ -133,4 +133,4 @@ void CAutoPilot::Load(uint8*& buf)
 	ReadSaveBuf(&m_nPathFindNodesCount, buf);
 	SkipSaveBuf(buf, 6);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/control/AutoPilot.h b/src/control/AutoPilot.h
index ec3bb8d8..407fbb70 100644
--- a/src/control/AutoPilot.h
+++ b/src/control/AutoPilot.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_AUTOPILOT_H__
+#define __GTA_AUTOPILOT_H__
 #include "Timer.h"
 
 class CVehicle;
@@ -135,3 +136,5 @@ public:
 };
 
 VALIDATE_SIZE(CAutoPilot, 0x70);
+
+#endif // __GTA_AUTOPILOT_H__
diff --git a/src/control/Bridge.h b/src/control/Bridge.h
index c5702629..9415ce38 100644
--- a/src/control/Bridge.h
+++ b/src/control/Bridge.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_BRIDGE_H__
+#define __GTA_BRIDGE_H__
 
 class CEntity;
 
@@ -26,3 +27,5 @@ public:
 	static void FindBridgeEntities();
 	static bool ThisIsABridgeObjectMovingUp(int);
 };
+
+#endif // __GTA_BRIDGE_H__
diff --git a/src/control/CarAI.h b/src/control/CarAI.h
index dcd76d78..dc0c070d 100644
--- a/src/control/CarAI.h
+++ b/src/control/CarAI.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CARAI_H__
+#define __GTA_CARAI_H__
 
 #include "AutoPilot.h"
 
@@ -29,3 +30,5 @@ public:
 	static void MellowOutChaseSpeedBoat(CVehicle*);
 	static void MakeWayForCarWithSiren(CVehicle *veh);
 };
+
+#endif // __GTA_CARAI_H__
diff --git a/src/control/CarCtrl.h b/src/control/CarCtrl.h
index 5efbe275..71f29393 100644
--- a/src/control/CarCtrl.h
+++ b/src/control/CarCtrl.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CARCTRL_H__
+#define __GTA_CARCTRL_H__
 #include "PathFind.h"
 #include "Boat.h"
 #include "Vehicle.h"
@@ -171,4 +172,6 @@ public:
 	static int32 LoadedCarsArray[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY];
 };
 
-extern CVehicle* apCarsToKeep[MAX_CARS_TO_KEEP];
\ No newline at end of file
+extern CVehicle* apCarsToKeep[MAX_CARS_TO_KEEP];
+
+#endif // __GTA_CARCTRL_H__
diff --git a/src/control/Curves.cpp b/src/control/Curves.cpp
index 5b590440..cf9c4e64 100644
--- a/src/control/Curves.cpp
+++ b/src/control/Curves.cpp
@@ -52,4 +52,4 @@ void CCurves::CalcCurvePoint(CVector* pPos1, CVector* pPos2, CVector* pDir1, CVe
 		(dir1.x * (1.0f - curveCoef) + dir2.x * curveCoef) / (timeOnCurve * 0.001f),
 		(dir1.y * (1.0f - curveCoef) + dir2.y * curveCoef) / (timeOnCurve * 0.001f),
 		0.0f);
-}
\ No newline at end of file
+}
diff --git a/src/control/Curves.h b/src/control/Curves.h
index 5d4e05a7..8099b2b6 100644
--- a/src/control/Curves.h
+++ b/src/control/Curves.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CURVES_H__
+#define __GTA_CURVES_H__
 class CVector;
 
 class CCurves
@@ -7,3 +8,5 @@ public:
 	static float CalcSpeedScaleFactor(CVector*, CVector*, float, float, float, float);
 	static void CalcCurvePoint(CVector*, CVector*, CVector*, CVector*, float, int32, CVector*, CVector*);
 };
+
+#endif // __GTA_CURVES_H__
diff --git a/src/control/Darkel.h b/src/control/Darkel.h
index 91955479..7ea0343f 100644
--- a/src/control/Darkel.h
+++ b/src/control/Darkel.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DARKEL_H__
+#define __GTA_DARKEL_H__
 
 #include "ModelIndices.h"
 #include "WeaponType.h"
@@ -53,3 +54,5 @@ public:
 	static void DealWithWeaponChangeAtEndOfFrenzy();
 
 };
+
+#endif // __GTA_DARKEL_H__
diff --git a/src/control/GameLogic.h b/src/control/GameLogic.h
index 9b774cc7..800b1bd5 100644
--- a/src/control/GameLogic.h
+++ b/src/control/GameLogic.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_GAMELOGIC_H__
+#define __GTA_GAMELOGIC_H__
 
 class CAutomobile;
 
@@ -48,4 +49,6 @@ public:
 	static CVector ShortCutDropOffForMission;
 	static float ShortCutDropOffOrientationForMission;
 	static bool MissionDropOffReadyToBeUsed;
-};
\ No newline at end of file
+};
+
+#endif // __GTA_GAMELOGIC_H__
diff --git a/src/control/Garages.h b/src/control/Garages.h
index 358d404d..da3bf963 100644
--- a/src/control/Garages.h
+++ b/src/control/Garages.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_GARAGES_H__
+#define __GTA_GARAGES_H__
 #include "audio_enums.h"
 #include "Camera.h"
 #include "config.h"
@@ -301,3 +302,5 @@ public:
 	static bool IsThisGarageTypeSafehouse(uint8 type) { return FindSafeHouseIndexForGarageType(type) >= 0; }
 
 };
+
+#endif // __GTA_GARAGES_H__
diff --git a/src/control/NameGrid.cpp b/src/control/NameGrid.cpp
index 204e8b9c..26f031c9 100644
--- a/src/control/NameGrid.cpp
+++ b/src/control/NameGrid.cpp
@@ -84,4 +84,4 @@ CGrid::Process()
 	ProcessControllerInput();
 	DisplayGrid();
 	playerName.DisplayName(2 * playerName.unk_4c);
-}
\ No newline at end of file
+}
diff --git a/src/control/NameGrid.h b/src/control/NameGrid.h
index d52cec73..c65a3b37 100644
--- a/src/control/NameGrid.h
+++ b/src/control/NameGrid.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_NAMEGRID_H__
+#define __GTA_NAMEGRID_H__
 
 // TODO: reverse mobile code
 
@@ -50,4 +51,6 @@ public:
 	void DisplayGrid();
 	void ProcessControllerInput();
 	void Process();
-};
\ No newline at end of file
+};
+
+#endif // __GTA_NAMEGRID_H__
diff --git a/src/control/OnscreenTimer.h b/src/control/OnscreenTimer.h
index 8c049d7d..593982f2 100644
--- a/src/control/OnscreenTimer.h
+++ b/src/control/OnscreenTimer.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ONSCREENTIMER_H__
+#define __GTA_ONSCREENTIMER_H__
 
 enum
 {
@@ -55,3 +56,5 @@ public:
 };
 
 VALIDATE_SIZE(COnscreenTimer, 0xF4);
+
+#endif // __GTA_ONSCREENTIMER_H__
diff --git a/src/control/PathFind.h b/src/control/PathFind.h
index 99759590..7be6dbad 100644
--- a/src/control/PathFind.h
+++ b/src/control/PathFind.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PATHFIND_H__
+#define __GTA_PATHFIND_H__
 
 #include "Treadable.h"
 
@@ -302,3 +303,5 @@ inline void CPathNode::SetNext(CPathNode *node) { nextIndex = ThePaths.GetIndex(
 extern bool gbShowPedPaths;
 extern bool gbShowCarPaths;
 extern bool gbShowCarPathsLinks;
+
+#endif // __GTA_PATHFIND_H__
diff --git a/src/control/Phones.h b/src/control/Phones.h
index 81b40dc2..2cc5ef1b 100644
--- a/src/control/Phones.h
+++ b/src/control/Phones.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PHONES_H__
+#define __GTA_PHONES_H__
 
 #include "Physical.h"
 
@@ -66,4 +67,6 @@ public:
 extern CPhoneInfo gPhoneInfo;
 
 void PhonePutDownCB(CAnimBlendAssociation *assoc, void *arg);
-void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg);
\ No newline at end of file
+void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg);
+
+#endif // __GTA_PHONES_H__
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index f6b1a9b9..3e04d7eb 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -1739,4 +1739,4 @@ CPed::CreateDeadPedPickupCoors(float *x, float *y, float *z)
 	*y = GetPosition().y;
 	*z = GetPosition().z + 0.4f;
 #undef NUMBER_OF_ATTEMPTS
-}
\ No newline at end of file
+}
diff --git a/src/control/Pickups.h b/src/control/Pickups.h
index 0de7f827..bd350a83 100644
--- a/src/control/Pickups.h
+++ b/src/control/Pickups.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PICKUPS_H__
+#define __GTA_PICKUPS_H__
 #include "Weapon.h"
 
 enum ePickupType
@@ -168,3 +169,5 @@ public:
 	static void ResetPowerPillsCarriedByPlayer(void);
 
 };
+
+#endif // __GTA_PICKUPS_H__
diff --git a/src/control/PowerPoints.cpp b/src/control/PowerPoints.cpp
index 9a74e8d9..8ffee454 100644
--- a/src/control/PowerPoints.cpp
+++ b/src/control/PowerPoints.cpp
@@ -19,4 +19,4 @@ void CPowerPoints::Save(uint8**, uint32*)
 {}
 
 void CPowerPoints::Load(uint8*, uint32)
-{}
\ No newline at end of file
+{}
diff --git a/src/control/PowerPoints.h b/src/control/PowerPoints.h
index ee3750cd..179c641d 100644
--- a/src/control/PowerPoints.h
+++ b/src/control/PowerPoints.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_POWERPOINTS_H__
+#define __GTA_POWERPOINTS_H__
 
 enum
 {
@@ -23,4 +24,6 @@ public:
 	static void GenerateNewOne(float, float, float, float, float, float, uint8);
 	static void Save(uint8**, uint32*);
 	static void Load(uint8*, uint32);
-};
\ No newline at end of file
+};
+
+#endif // __GTA_POWERPOINTS_H__
diff --git a/src/control/Record.h b/src/control/Record.h
index 6a94c408..800692c3 100644
--- a/src/control/Record.h
+++ b/src/control/Record.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RECORD_H__
+#define __GTA_RECORD_H__
 
 class CAutomobile;
 class CVehicle;
@@ -102,3 +103,5 @@ private:
 	static uint8* PackCurrentPadValues(uint8*, CControllerState*, CControllerState*);
 	static uint8* UnPackCurrentPadValues(uint8*, uint8, CControllerState*);
 };
+
+#endif // __GTA_RECORD_H__
diff --git a/src/control/Remote.h b/src/control/Remote.h
index 72cabb7c..2cba7b70 100644
--- a/src/control/Remote.h
+++ b/src/control/Remote.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_REMOTE_H__
+#define __GTA_REMOTE_H__
 
 class CRemote
 {
@@ -6,3 +7,5 @@ public:
 	static void GivePlayerRemoteControlledCar(float, float, float, float, uint16);
 	static void TakeRemoteControlledCarFromPlayer(bool blowUp = true);
 };
+
+#endif // __GTA_REMOTE_H__
diff --git a/src/control/Replay.h b/src/control/Replay.h
index 5dd8b651..33d9c525 100644
--- a/src/control/Replay.h
+++ b/src/control/Replay.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_REPLAY_H__
+#define __GTA_REPLAY_H__
 
 #include "Pools.h"
 #include "World.h"
@@ -415,3 +416,5 @@ private:
 	static void GoToNextBlock(void);
 #endif
 };
+
+#endif // __GTA_REPLAY_H__
diff --git a/src/control/Restart.h b/src/control/Restart.h
index 5d84c723..c68a2ec1 100644
--- a/src/control/Restart.h
+++ b/src/control/Restart.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RESTART_H__
+#define __GTA_RESTART_H__
 
 #define NUM_RESTART_POINTS 8
 
@@ -34,3 +35,5 @@ public:
 	static float PoliceRestartHeadings[NUM_RESTART_POINTS];
 	static uint16 NumberOfPoliceRestarts;
 };
+
+#endif // __GTA_RESTART_H__
diff --git a/src/control/RoadBlocks.h b/src/control/RoadBlocks.h
index ef614950..2c1fc681 100644
--- a/src/control/RoadBlocks.h
+++ b/src/control/RoadBlocks.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ROADBLOCKS_H__
+#define __GTA_ROADBLOCKS_H__
 #include "common.h"
 
 class CVehicle;
@@ -28,3 +29,5 @@ public:
 	static void RegisterScriptRoadBlock(CVector, CVector);
 	static void ClearScriptRoadBlocks();
 };
+
+#endif // __GTA_ROADBLOCKS_H__
diff --git a/src/control/SceneEdit.h b/src/control/SceneEdit.h
index 7c8fb98a..5e1c0649 100644
--- a/src/control/SceneEdit.h
+++ b/src/control/SceneEdit.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SCENEEDIT_H__
+#define __GTA_SCENEEDIT_H__
 #ifdef GTA_SCENE_EDIT
 class CPed;
 class CVehicle;
@@ -94,3 +95,5 @@ public:
 	static bool SelectWeapon(void);
 };
 #endif
+
+#endif // __GTA_SCENEEDIT_H__
diff --git a/src/control/Script.h b/src/control/Script.h
index 7f9a7717..08a34517 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SCRIPT_H__
+#define __GTA_SCRIPT_H__
 #include "Font.h"
 #include "PedType.h"
 #include "Text.h"
@@ -637,3 +638,5 @@ enum {
 	MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART,
 };
 #endif
+
+#endif // __GTA_SCRIPT_H__
diff --git a/src/control/ScriptCommands.h b/src/control/ScriptCommands.h
index 9cb39e23..1734492a 100644
--- a/src/control/ScriptCommands.h
+++ b/src/control/ScriptCommands.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SCRIPTCOMMANDS_H__
+#define __GTA_SCRIPTCOMMANDS_H__
 
 enum {
 	COMMAND_NOP = 0,
@@ -1505,4 +1506,6 @@ struct tScriptCommandData
 	int position;
 	const char name_override[8];
 };
-#endif
\ No newline at end of file
+#endif
+
+#endif // __GTA_SCRIPTCOMMANDS_H__
diff --git a/src/control/SetPieces.cpp b/src/control/SetPieces.cpp
index 5edcd335..0699ec7f 100644
--- a/src/control/SetPieces.cpp
+++ b/src/control/SetPieces.cpp
@@ -322,4 +322,4 @@ CCopPed* CSetPiece::TryToGenerateCopPed(CVector2D vSpawn)
 	}
 	CWorld::Add(pCop);
 	return pCop;
-}
\ No newline at end of file
+}
diff --git a/src/control/SetPieces.h b/src/control/SetPieces.h
index 5c228d4c..7fe544ad 100644
--- a/src/control/SetPieces.h
+++ b/src/control/SetPieces.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SETPIECES_H__
+#define __GTA_SETPIECES_H__
 
 #include "config.h"
 
@@ -46,3 +47,5 @@ public:
 	static void Load(uint8*, uint32);
 	static void Update(void);
 };
+
+#endif // __GTA_SETPIECES_H__
diff --git a/src/control/TrafficLights.h b/src/control/TrafficLights.h
index 8dba45e1..f81a0943 100644
--- a/src/control/TrafficLights.h
+++ b/src/control/TrafficLights.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TRAFFICLIGHTS_H__
+#define __GTA_TRAFFICLIGHTS_H__
 
 class CEntity;
 class CVehicle;
@@ -30,3 +31,5 @@ public:
 	static bool ShouldCarStopForLight(CVehicle*, bool);
 	static bool ShouldCarStopForBridge(CVehicle*);
 };
+
+#endif // __GTA_TRAFFICLIGHTS_H__
diff --git a/src/core/Accident.h b/src/core/Accident.h
index 568e1149..2f0cef17 100644
--- a/src/core/Accident.h
+++ b/src/core/Accident.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ACCIDENT_H__
+#define __GTA_ACCIDENT_H__
 #include "config.h"
 
 class CPed;
@@ -28,4 +29,6 @@ public:
 	bool WorkToDoForMedics();
 };
 
-extern CAccidentManager gAccidentManager;
\ No newline at end of file
+extern CAccidentManager gAccidentManager;
+
+#endif // __GTA_ACCIDENT_H__
diff --git a/src/core/AnimViewer.h b/src/core/AnimViewer.h
index 13dbb8fb..00f55e3a 100644
--- a/src/core/AnimViewer.h
+++ b/src/core/AnimViewer.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ANIMVIEWER_H__
+#define __GTA_ANIMVIEWER_H__
 
 class CAnimViewer {
 public:
@@ -9,4 +10,6 @@ public:
 	static void Render();
 	static void Shutdown();
 	static void Update();
-};
\ No newline at end of file
+};
+
+#endif // __GTA_ANIMVIEWER_H__
diff --git a/src/core/Camera.h b/src/core/Camera.h
index 39ecb760..88b0a965 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CAMERA_H__
+#define __GTA_CAMERA_H__
 #include "Placeable.h"
 
 class CEntity;
@@ -643,3 +644,5 @@ extern CCamera TheCamera;
 void CamShakeNoPos(CCamera*, float);
 void MakeAngleLessThan180(float &Angle);
 void WellBufferMe(float Target, float *CurrentValue, float *CurrentSpeed, float MaxSpeed, float Acceleration, bool IsAngle);
+
+#endif // __GTA_CAMERA_H__
diff --git a/src/core/CdStream.h b/src/core/CdStream.h
index 516cef48..d35c5a6d 100644
--- a/src/core/CdStream.h
+++ b/src/core/CdStream.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CDSTREAM_H__
+#define __GTA_CDSTREAM_H__
 
 #define CDSTREAM_SECTOR_SIZE 2048
 
@@ -46,3 +47,5 @@ int32 CdStreamGetNumImages(void);
 #ifdef FLUSHABLE_STREAMING
 extern bool flushStream[MAX_CDCHANNELS];
 #endif
+
+#endif // __GTA_CDSTREAM_H__
diff --git a/src/core/Clock.h b/src/core/Clock.h
index a611cd50..6cf85e12 100644
--- a/src/core/Clock.h
+++ b/src/core/Clock.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CLOCK_H__
+#define __GTA_CLOCK_H__
 
 class CClock
 {
@@ -29,3 +30,5 @@ public:
 	static uint8 &GetHoursRef(void) { return ms_nGameClockHours; }
 	static uint8 &GetMinutesRef(void) { return ms_nGameClockMinutes; }
 };
+
+#endif // __GTA_CLOCK_H__
diff --git a/src/core/ControllerConfig.h b/src/core/ControllerConfig.h
index d61e23e6..a8766d19 100644
--- a/src/core/ControllerConfig.h
+++ b/src/core/ControllerConfig.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CONTROLLERCONFIG_H__
+#define __GTA_CONTROLLERCONFIG_H__
 
 #if defined RW_D3D9 || defined RWLIBS
 #define DIRECTINPUT_VERSION 0x0800
@@ -226,4 +227,6 @@ public:
 VALIDATE_SIZE(CControllerConfigManager, 0x143C);
 #endif
 
-extern CControllerConfigManager ControlsManager;
\ No newline at end of file
+extern CControllerConfigManager ControlsManager;
+
+#endif // __GTA_CONTROLLERCONFIG_H__
diff --git a/src/core/Crime.h b/src/core/Crime.h
index 4c7ea315..d9025950 100644
--- a/src/core/Crime.h
+++ b/src/core/Crime.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CRIME_H__
+#define __GTA_CRIME_H__
 
 enum eCrimeType {
 	CRIME_NONE,
@@ -37,3 +38,5 @@ public:
 	CCrimeBeingQd() { };
 	~CCrimeBeingQd() { };
 };
+
+#endif // __GTA_CRIME_H__
diff --git a/src/core/Debug.h b/src/core/Debug.h
index 4a25bf41..6753dcac 100644
--- a/src/core/Debug.h
+++ b/src/core/Debug.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DEBUG_H__
+#define __GTA_DEBUG_H__
 
 class CDebug
 {
@@ -43,3 +44,5 @@ public:
 };
 
 extern bool gbDebugStuffInRelease;
+
+#endif // __GTA_DEBUG_H__
diff --git a/src/core/Directory.h b/src/core/Directory.h
index 0fef080f..aef047fc 100644
--- a/src/core/Directory.h
+++ b/src/core/Directory.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DIRECTORY_H__
+#define __GTA_DIRECTORY_H__
 
 class CDirectory
 {
@@ -21,3 +22,5 @@ public:
 	void AddItem(const DirectoryInfo &dirinfo, int32 imgId);
 	bool FindItem(const char *name, uint32 &offset, uint32 &size);
 };
+
+#endif // __GTA_DIRECTORY_H__
diff --git a/src/core/EventList.h b/src/core/EventList.h
index 3e9d8fd4..214cbb74 100644
--- a/src/core/EventList.h
+++ b/src/core/EventList.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_EVENTLIST_H__
+#define __GTA_EVENTLIST_H__
 
 class CEntity;
 class CPed;
@@ -65,4 +66,6 @@ public:
 	static void ReportCrimeForEvent(eEventType type, intptr, bool);
 };
 
-extern CEvent gaEvent[NUMEVENTS];
\ No newline at end of file
+extern CEvent gaEvent[NUMEVENTS];
+
+#endif // __GTA_EVENTLIST_H__
diff --git a/src/core/FileLoader.h b/src/core/FileLoader.h
index 077e7bdd..23255dbe 100644
--- a/src/core/FileLoader.h
+++ b/src/core/FileLoader.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_FILELOADER_H__
+#define __GTA_FILELOADER_H__
 
 class CFileLoader
 {
@@ -46,3 +47,5 @@ public:
 	static void ReloadObject(const char *line);
 	static void ReLoadScene(const char *filename); // unused mobile function
 };
+
+#endif // __GTA_FILELOADER_H__
diff --git a/src/core/FileMgr.h b/src/core/FileMgr.h
index a7dbffa6..a3a39285 100644
--- a/src/core/FileMgr.h
+++ b/src/core/FileMgr.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_FILEMGR_H__
+#define __GTA_FILEMGR_H__
 
 class CFileMgr
 {
@@ -21,3 +22,5 @@ public:
 	static int GetErrorReadWrite(int fd);
 	static char *GetRootDirName() { return ms_rootDirName; }
 };
+
+#endif // __GTA_FILEMGR_H__
diff --git a/src/core/Fire.h b/src/core/Fire.h
index 8126f830..5dd623f0 100644
--- a/src/core/Fire.h
+++ b/src/core/Fire.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_FIRE_H__
+#define __GTA_FIRE_H__
 
 class CEntity;
 
@@ -51,3 +52,5 @@ public:
 	void SetScriptFireAudio(int16 index, bool state);
 };
 extern CFireManager gFireManager;
+
+#endif // __GTA_FIRE_H__
diff --git a/src/core/FrontEndControls.h b/src/core/FrontEndControls.h
index 68dab90b..33a4bacc 100644
--- a/src/core/FrontEndControls.h
+++ b/src/core/FrontEndControls.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_FRONTENDCONTROLS_H__
+#define __GTA_FRONTENDCONTROLS_H__
 
 enum {
 	NUM_MULTICHOICE_OPTIONS = 16,
@@ -747,4 +748,6 @@ public:
 	virtual void GoDownMenuOnPage(void);
 	virtual void GoLeftMenuOnPage(void);
 	virtual void GoRightMenuOnPage(void);
-};
\ No newline at end of file
+};
+
+#endif // __GTA_FRONTENDCONTROLS_H__
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index b9be5a82..1afd62c7 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_FRONTEND_H__
+#define __GTA_FRONTEND_H__
 #ifdef PS2_MENU
 #include "Frontend_PS2.h"
 #else
@@ -869,3 +870,5 @@ VALIDATE_SIZE(CMenuManager, 0x688);
 extern CMenuManager FrontEndMenuManager;
 
 #endif
+
+#endif // __GTA_FRONTEND_H__
diff --git a/src/core/FrontendTriggers.h b/src/core/FrontendTriggers.h
index 44bae54f..ac93c38e 100644
--- a/src/core/FrontendTriggers.h
+++ b/src/core/FrontendTriggers.h
@@ -1390,4 +1390,4 @@ TriggerDisplay_Trails(CMenuOnOffTriggered *widget)
 	}
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/core/Frontend_PS2.h b/src/core/Frontend_PS2.h
index 6311d821..bdbe9e79 100644
--- a/src/core/Frontend_PS2.h
+++ b/src/core/Frontend_PS2.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_FRONTEND_PS2_H__
+#define __GTA_FRONTEND_PS2_H__
 #include "Sprite2d.h"
 
 enum
@@ -244,4 +245,6 @@ public:
 	void FilterOutColorMarkersFromString(wchar *string, CRGBA &color);
 };
 
-extern CMenuManager FrontEndMenuManager;
\ No newline at end of file
+extern CMenuManager FrontEndMenuManager;
+
+#endif // __GTA_FRONTEND_PS2_H__
diff --git a/src/core/Game.h b/src/core/Game.h
index 4052eb00..63133b30 100644
--- a/src/core/Game.h
+++ b/src/core/Game.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_GAME_H__
+#define __GTA_GAME_H__
 
 enum eLevelName {
 	LEVEL_IGNORE = -1, // beware, this is only used in CPhysical's m_nZoneLevel
@@ -79,3 +80,5 @@ public:
 };
 
 inline bool IsAreaVisible(int area) { return area == CGame::currArea || area == AREA_EVERYWHERE; }
+
+#endif // __GTA_GAME_H__
diff --git a/src/core/General.h b/src/core/General.h
index c17d916d..c01d985e 100644
--- a/src/core/General.h
+++ b/src/core/General.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_GENERAL_H__
+#define __GTA_GENERAL_H__
 
 #include <ctype.h>
 
@@ -169,3 +170,5 @@ public:
 	static void SetRandomSeed(int32 seed)
 		{ mysrand(seed); }
 };
+
+#endif // __GTA_GENERAL_H__
diff --git a/src/core/IniFile.cpp b/src/core/IniFile.cpp
index 5d343ec9..e38d5a92 100644
--- a/src/core/IniFile.cpp
+++ b/src/core/IniFile.cpp
@@ -26,4 +26,4 @@ void CIniFile::LoadIniFile()
 	CPopulation::MaxNumberOfPedsInUse = DEFAULT_MAX_NUMBER_OF_PEDS * PedNumberMultiplier;
 	CPopulation::MaxNumberOfPedsInUseInterior = DEFAULT_MAX_NUMBER_OF_PEDS_INTERIOR * PedNumberMultiplier;
 	CCarCtrl::MaxNumberOfCarsInUse = DEFAULT_MAX_NUMBER_OF_CARS * CarNumberMultiplier;
-}
\ No newline at end of file
+}
diff --git a/src/core/IniFile.h b/src/core/IniFile.h
index dcaed980..50b6ca56 100644
--- a/src/core/IniFile.h
+++ b/src/core/IniFile.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_INIFILE_H__
+#define __GTA_INIFILE_H__
 
 #define DEFAULT_MAX_NUMBER_OF_PEDS 25.0f
 #define DEFAULT_MAX_NUMBER_OF_PEDS_INTERIOR 40.0f
@@ -12,3 +13,5 @@ public:
 	static float PedNumberMultiplier;
 	static float CarNumberMultiplier;
 };
+
+#endif // __GTA_INIFILE_H__
diff --git a/src/core/Lists.h b/src/core/Lists.h
index 7572e882..b71577de 100644
--- a/src/core/Lists.h
+++ b/src/core/Lists.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_LISTS_H__
+#define __GTA_LISTS_H__
 
 class CPtrNode
 {
@@ -128,3 +129,5 @@ public:
 		}
 	}
 };
+
+#endif // __GTA_LISTS_H__
diff --git a/src/core/Pad.h b/src/core/Pad.h
index f141ed6c..03519a6d 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PAD_H__
+#define __GTA_PAD_H__
 
 enum {
 	PLAYERCONTROL_ENABLED = 0,
@@ -483,3 +484,5 @@ public:
 
 VALIDATE_SIZE(CPad, 0xFC);
 extern CPad Pads[MAX_PADS];
+
+#endif // __GTA_PAD_H__
diff --git a/src/core/Placeable.h b/src/core/Placeable.h
index 94be3211..ef72fda2 100644
--- a/src/core/Placeable.h
+++ b/src/core/Placeable.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PLACEABLE_H__
+#define __GTA_PLACEABLE_H__
 
 class CPlaceable
 {
@@ -34,3 +35,5 @@ public:
 };
 
 VALIDATE_SIZE(CPlaceable, 0x48);
+
+#endif // __GTA_PLACEABLE_H__
diff --git a/src/core/PlayerInfo.h b/src/core/PlayerInfo.h
index fc12267d..5f67861a 100644
--- a/src/core/PlayerInfo.h
+++ b/src/core/PlayerInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PLAYERINFO_H__
+#define __GTA_PLAYERINFO_H__
 
 #include "ColModel.h"
 
@@ -121,4 +122,6 @@ CVector FindPlayerCoors(void);
 const CVector &FindPlayerSpeed(void);
 const CVector &FindPlayerCentreOfWorld(int32 player);
 const CVector &FindPlayerCentreOfWorld_NoSniperShift(void);
-float FindPlayerHeading(void);
\ No newline at end of file
+float FindPlayerHeading(void);
+
+#endif // __GTA_PLAYERINFO_H__
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
index e601b3c8..b973dddb 100644
--- a/src/core/Pools.cpp
+++ b/src/core/Pools.cpp
@@ -644,4 +644,4 @@ VALIDATESAVEBUF(size)
 }
 
 #undef CopyFromBuf
-#undef CopyToBuf
\ No newline at end of file
+#undef CopyToBuf
diff --git a/src/core/Pools.h b/src/core/Pools.h
index afef1b85..dfb0d79d 100644
--- a/src/core/Pools.h
+++ b/src/core/Pools.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_POOLS_H__
+#define __GTA_POOLS_H__
 
 #include "templates.h"
 #include "Lists.h"
@@ -62,3 +63,5 @@ public:
 	static void SavePedPool(uint8 *buf, uint32 *size);
 	static void SaveVehiclePool(uint8 *buf, uint32 *size);
 };
+
+#endif // __GTA_POOLS_H__
diff --git a/src/core/Profile.h b/src/core/Profile.h
index 4fe693ae..e707d699 100644
--- a/src/core/Profile.h
+++ b/src/core/Profile.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PROFILE_H__
+#define __GTA_PROFILE_H__
 
 enum eProfile
 {
@@ -26,3 +27,5 @@ public:
 	static void SuspendProfile(eProfile profile);
 	static void ShowResults();
 };
+
+#endif // __GTA_PROFILE_H__
diff --git a/src/core/Radar.h b/src/core/Radar.h
index afb37fe4..8b6699d9 100644
--- a/src/core/Radar.h
+++ b/src/core/Radar.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RADAR_H__
+#define __GTA_RADAR_H__
 #include "Sprite2d.h"
 #include "Draw.h"
 
@@ -292,3 +293,5 @@ public:
 	static void DrawCoordBlip(int32 blipId);
 	static void DrawLegend(int32, int32, int32);
 };
+
+#endif // __GTA_RADAR_H__
diff --git a/src/core/Range2D.h b/src/core/Range2D.h
index f239e7de..ba5d75f1 100644
--- a/src/core/Range2D.h
+++ b/src/core/Range2D.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RANGE2D_H__
+#define __GTA_RANGE2D_H__
 
 class CRange2D
 {
@@ -8,4 +9,6 @@ public:
 	bool IsInRange(CVector2D vec);
 	void DebugShowRange(float, int);
 	CVector2D GetRandomPointInRange();
-};
\ No newline at end of file
+};
+
+#endif // __GTA_RANGE2D_H__
diff --git a/src/core/Range3D.h b/src/core/Range3D.h
index f42b523b..d2f173bf 100644
--- a/src/core/Range3D.h
+++ b/src/core/Range3D.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RANGE3D_H__
+#define __GTA_RANGE3D_H__
 
 class CRange3D
 {
@@ -8,4 +9,6 @@ public:
 	bool IsInRange(CVector vec);
 	void DebugShowRange(float, int);
 	CVector GetRandomPointInRange();
-};
\ No newline at end of file
+};
+
+#endif // __GTA_RANGE3D_H__
diff --git a/src/core/References.h b/src/core/References.h
index e7a64de7..2b9fe88d 100644
--- a/src/core/References.h
+++ b/src/core/References.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_REFERENCES_H__
+#define __GTA_REFERENCES_H__
 
 class CEntity;
 
@@ -18,3 +19,5 @@ public:
 	static void RemoveReferencesToPlayer(void);
 	static void PruneAllReferencesInWorld(void);
 };
+
+#endif // __GTA_REFERENCES_H__
diff --git a/src/core/Ropes.h b/src/core/Ropes.h
index 7930fa98..748d9455 100644
--- a/src/core/Ropes.h
+++ b/src/core/Ropes.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ROPES_H__
+#define __GTA_ROPES_H__
 
 class CRope
 {
@@ -29,3 +30,5 @@ public:
 	static bool FindCoorsAlongRope(uintptr id, float t, CVector *coors);
 	static bool CreateRopeWithSwatComingDown(CVector pos);
 };
+
+#endif // __GTA_ROPES_H__
diff --git a/src/core/Stats.h b/src/core/Stats.h
index 243ff0ec..e1c1f389 100644
--- a/src/core/Stats.h
+++ b/src/core/Stats.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_STATS_H__
+#define __GTA_STATS_H__
 
 #include "PedType.h"
 #include "audio_enums.h"
@@ -150,3 +151,5 @@ public:
 	static void BuildStatLine(Const char *, void *, int, void *, int);
 	static int ConstructStatLine(int);
 };
+
+#endif // __GTA_STATS_H__
diff --git a/src/core/Streaming.h b/src/core/Streaming.h
index 4ddf0b3b..18f5b900 100644
--- a/src/core/Streaming.h
+++ b/src/core/Streaming.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_STREAMING_H__
+#define __GTA_STREAMING_H__
 
 #include "Game.h"
 
@@ -217,3 +218,5 @@ public:
 
 	static void PrintStreamingBufferState();
 };
+
+#endif // __GTA_STREAMING_H__
diff --git a/src/core/SurfaceTable.h b/src/core/SurfaceTable.h
index 8ff43106..423d962e 100644
--- a/src/core/SurfaceTable.h
+++ b/src/core/SurfaceTable.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SURFACETABLE_H__
+#define __GTA_SURFACETABLE_H__
 
 enum eSurfaceType
 {
@@ -99,3 +100,5 @@ public:
 	static float GetAdhesiveLimit(CColPoint &colpoint);
 	static bool IsSoftLanding(uint8 surf);
 };
+
+#endif // __GTA_SURFACETABLE_H__
diff --git a/src/core/TimeStep.h b/src/core/TimeStep.h
index 6101b4c2..581ee004 100644
--- a/src/core/TimeStep.h
+++ b/src/core/TimeStep.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TIMESTEP_H__
+#define __GTA_TIMESTEP_H__
 
 // Pretty sure this class is not used by the game
 class CTimeStep
@@ -8,3 +9,5 @@ public:
 	static float ms_fFramesPerUpdate;
 	static float ms_fTimeStep;
 };
+
+#endif // __GTA_TIMESTEP_H__
diff --git a/src/core/Timer.h b/src/core/Timer.h
index 819bd30c..a37f2fae 100644
--- a/src/core/Timer.h
+++ b/src/core/Timer.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TIMER_H__
+#define __GTA_TIMER_H__
 
 class CTimer
 {
@@ -69,3 +70,5 @@ public:
 	static uint32 GetLogicalFramesPassed(void) { return m_LogicalFramesPassed; }
 #endif
 };
+
+#endif // __GTA_TIMER_H__
diff --git a/src/core/User.h b/src/core/User.h
index dd53a40a..d08392a4 100644
--- a/src/core/User.h
+++ b/src/core/User.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_USER_H__
+#define __GTA_USER_H__
 
 #include "Pager.h"
 #include "OnscreenTimer.h"
@@ -40,3 +41,5 @@ public:
 	static void Init();
 	static void Process();
 };
+
+#endif // __GTA_USER_H__
diff --git a/src/core/Wanted.h b/src/core/Wanted.h
index f2da23e3..6f81b826 100644
--- a/src/core/Wanted.h
+++ b/src/core/Wanted.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_WANTED_H__
+#define __GTA_WANTED_H__
 
 #include "Crime.h"
 
@@ -63,3 +64,5 @@ public:
 };
 
 VALIDATE_SIZE(CWanted, 0x204);
+
+#endif // __GTA_WANTED_H__
diff --git a/src/core/World.h b/src/core/World.h
index 81eb5d4c..e0abb4df 100644
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_WORLD_H__
+#define __GTA_WORLD_H__
 
 #include "Game.h"
 #include "Lists.h"
@@ -174,3 +175,5 @@ public:
 };
 
 extern CColPoint gaTempSphereColPoints[MAX_COLLISION_POINTS];
+
+#endif // __GTA_WORLD_H__
diff --git a/src/core/Zones.cpp b/src/core/Zones.cpp
index 93eca199..956a41ae 100644
--- a/src/core/Zones.cpp
+++ b/src/core/Zones.cpp
@@ -797,4 +797,4 @@ CTheZones::LoadOneZone(CZone *zone, uint8 **buffer, uint32 *length, eZoneType zo
 	zone->parent = GetPointerForNavigationZoneIndex(zoneId);
 	ReadSaveBuf(&zoneId, *buffer, *length);
 	zone->next = GetPointerForNavigationZoneIndex(zoneId);
-}
\ No newline at end of file
+}
diff --git a/src/core/Zones.h b/src/core/Zones.h
index 2316eeef..01aff768 100644
--- a/src/core/Zones.h
+++ b/src/core/Zones.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ZONES_H__
+#define __GTA_ZONES_H__
 
 #include "Game.h"
 #include "Gangs.h"
@@ -112,3 +113,5 @@ public:
 	static void LoadAllZones(uint8 *buffer, uint32 length);
 	static void LoadOneZone(CZone *zone, uint8 **buffer, uint32 *length, eZoneType zoneType);
 };
+
+#endif // __GTA_ZONES_H__
diff --git a/src/core/common.h b/src/core/common.h
index 12c80b71..c118372c 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_COMMON_H__
+#define __GTA_COMMON_H__
 
 #define _CRT_SECURE_NO_WARNINGS
 #define _USE_MATH_DEFINES
@@ -400,3 +401,5 @@ template<int s, int t> struct check_size {
 #define CONCAT_(x,y) x##y
 #define CONCAT(x,y) CONCAT_(x,y)
 
+
+#endif // __GTA_COMMON_H__
diff --git a/src/core/config.h b/src/core/config.h
index 8943223b..94b6e406 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CONFIG_H__
+#define __GTA_CONFIG_H__
 
 // disables (most) stuff that wasn't in original gta-vc.exe
 #ifdef __MWERKS__
@@ -500,3 +501,5 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually
 #if defined(GTA_PS2) && defined(EXTERNAL_3D_SOUND)
 #error EXTERNAL_3D_SOUND cannot work on PS2
 #endif
+
+#endif // __GTA_CONFIG_H__
diff --git a/src/core/main.h b/src/core/main.h
index 803afb14..28fa9cc5 100644
--- a/src/core/main.h
+++ b/src/core/main.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MAIN_H__
+#define __GTA_MAIN_H__
 
 #ifndef FINAL
 // defined in RwHelpder.cpp
@@ -74,3 +75,5 @@ extern bool gbDrawVersionText;
 #ifdef NO_MOVIES
 extern bool gbNoMovies;
 #endif
+
+#endif // __GTA_MAIN_H__
diff --git a/src/core/obrstr.cpp b/src/core/obrstr.cpp
index d9f7e9b4..c83009be 100644
--- a/src/core/obrstr.cpp
+++ b/src/core/obrstr.cpp
@@ -116,4 +116,4 @@ void IntToStr(int32 inNum, char *outStr)
 		inNum /= 10;
 	} while (++i < strSize);
 	outStr[strSize] = '\0';
-}
\ No newline at end of file
+}
diff --git a/src/core/obrstr.h b/src/core/obrstr.h
index c1633614..883637f2 100644
--- a/src/core/obrstr.h
+++ b/src/core/obrstr.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_OBRSTR_H__
+#define __GTA_OBRSTR_H__
 
 void ObrInt(int32 n1);
 void ObrInt2(int32 n1, int32 n2);
@@ -6,4 +7,6 @@ void ObrInt3(int32 n1, int32 n2, int32 n3);
 void ObrInt4(int32 n1, int32 n2, int32 n3, int32 n4);
 void ObrInt5(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5);
 void ObrInt6(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6);
-void IntToStr(int32 inNum, char *outStr);
\ No newline at end of file
+void IntToStr(int32 inNum, char *outStr);
+
+#endif // __GTA_OBRSTR_H__
diff --git a/src/core/templates.h b/src/core/templates.h
index 7bc85ee6..4460ce2b 100644
--- a/src/core/templates.h
+++ b/src/core/templates.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TEMPLATES_H__
+#define __GTA_TEMPLATES_H__
 
 template<typename T, int32 n>
 class CStore
@@ -268,3 +269,5 @@ public:
 		return n;
 	}
 };
+
+#endif // __GTA_TEMPLATES_H__
diff --git a/src/core/timebars.cpp b/src/core/timebars.cpp
index 169fef8c..83d3d560 100644
--- a/src/core/timebars.cpp
+++ b/src/core/timebars.cpp
@@ -118,4 +118,4 @@ void tbDisplay()
 #endif // !FINAL
 	}
 }
-#endif // !MASTER
\ No newline at end of file
+#endif // !MASTER
diff --git a/src/core/timebars.h b/src/core/timebars.h
index c4939802..4afbea4e 100644
--- a/src/core/timebars.h
+++ b/src/core/timebars.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TIMEBARS_H__
+#define __GTA_TIMEBARS_H__
 
 #ifdef TIMEBARS
 void tbInit();
@@ -11,3 +12,5 @@ void tbDisplay();
 #define tbEndTimer(a)
 #define tbDisplay()
 #endif
+
+#endif // __GTA_TIMEBARS_H__
diff --git a/src/entities/Dummy.h b/src/entities/Dummy.h
index 9b73eefc..6a56741c 100644
--- a/src/entities/Dummy.h
+++ b/src/entities/Dummy.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DUMMY_H__
+#define __GTA_DUMMY_H__
 
 #include "Lists.h"
 #include "Entity.h"
@@ -17,3 +18,5 @@ public:
 };
 
 bool IsDummyPointerValid(CDummy* pDummy);
+
+#endif // __GTA_DUMMY_H__
diff --git a/src/entities/Entity.h b/src/entities/Entity.h
index 957ee3bf..e66c2472 100644
--- a/src/entities/Entity.h
+++ b/src/entities/Entity.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ENTITY_H__
+#define __GTA_ENTITY_H__
 
 #include "ModelInfo.h"
 #include "Placeable.h"
@@ -182,3 +183,5 @@ public:
 };
 
 bool IsEntityPointerValid(CEntity*);
+
+#endif // __GTA_ENTITY_H__
diff --git a/src/entities/Physical.h b/src/entities/Physical.h
index f552da6c..25a49b2b 100644
--- a/src/entities/Physical.h
+++ b/src/entities/Physical.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PHYSICAL_H__
+#define __GTA_PHYSICAL_H__
 
 #include "Lists.h"
 #include "Timer.h"
@@ -173,3 +174,5 @@ public:
 	bool CheckCollision(void);
 	bool CheckCollision_SimpleCar(void);
 };
+
+#endif // __GTA_PHYSICAL_H__
diff --git a/src/extras/GitSHA1.h b/src/extras/GitSHA1.h
index 359bfaff..d017fcda 100644
--- a/src/extras/GitSHA1.h
+++ b/src/extras/GitSHA1.h
@@ -1 +1 @@
-extern const char* g_GIT_SHA1;
\ No newline at end of file
+extern const char* g_GIT_SHA1;
diff --git a/src/extras/custompipes.h b/src/extras/custompipes.h
index 7ad239f0..8def522c 100644
--- a/src/extras/custompipes.h
+++ b/src/extras/custompipes.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CUSTOMPIPES_H__
+#define __GTA_CUSTOMPIPES_H__
 
 #ifdef LIBRW
 #ifdef EXTENDED_PIPELINES
@@ -143,3 +144,5 @@ void RenderBlendPass(int pass);
 }
 
 #endif
+
+#endif // __GTA_CUSTOMPIPES_H__
diff --git a/src/extras/debugmenu.cpp b/src/extras/debugmenu.cpp
index 533b97f5..da0dbb81 100644
--- a/src/extras/debugmenu.cpp
+++ b/src/extras/debugmenu.cpp
@@ -1309,4 +1309,4 @@ DebugMenuEntrySetAddress(MenuEntry *e, void *addr)
 			((MenuEntry_Float32*)e)->variable = (float*)addr;
 	}
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/extras/debugmenu.h b/src/extras/debugmenu.h
index f1357c0a..201c6040 100644
--- a/src/extras/debugmenu.h
+++ b/src/extras/debugmenu.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DEBUGMENU_H__
+#define __GTA_DEBUGMENU_H__
 
 #ifdef DEBUGMENU
 
@@ -201,4 +202,6 @@ inline DebugMenuEntry *DebugMenuAddVarBool8(const char *path, const char *name,
 {
 	return DebugMenuAddVarBool8(path, name, (int8_t*)ptr, triggerFunc);
 }
-#endif
\ No newline at end of file
+#endif
+
+#endif // __GTA_DEBUGMENU_H__
diff --git a/src/extras/frontendoption.h b/src/extras/frontendoption.h
index db1b9021..f7d1fcdf 100644
--- a/src/extras/frontendoption.h
+++ b/src/extras/frontendoption.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_FRONTENDOPTION_H__
+#define __GTA_FRONTENDOPTION_H__
 #include "common.h"
 
 #ifdef CUSTOM_FRONTEND_OPTIONS
@@ -86,3 +87,5 @@ void FrontendOptionAddDynamic(const char* gxtKey, uint16 x, uint16 y, uint8 alig
 // lineHeight = 0 means game will use MENU_DEFAULT_LINE_HEIGHT
 uint8 FrontendScreenAdd(const char* gxtKey, int prevPage, int lineHeight, bool showLeftRightHelper, ReturnPrevPageFunc returnPrevPageFunc = nil);
 #endif
+
+#endif // __GTA_FRONTENDOPTION_H__
diff --git a/src/extras/postfx.h b/src/extras/postfx.h
index db702bf3..f505d796 100644
--- a/src/extras/postfx.h
+++ b/src/extras/postfx.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_POSTFX_H__
+#define __GTA_POSTFX_H__
 
 #ifdef EXTENDED_COLOURFILTER
 
@@ -44,3 +45,5 @@ public:
 };
 
 #endif
+
+#endif // __GTA_POSTFX_H__
diff --git a/src/extras/re3_inttypes.h b/src/extras/re3_inttypes.h
index bf0c53e2..e879f962 100644
--- a/src/extras/re3_inttypes.h
+++ b/src/extras/re3_inttypes.h
@@ -213,4 +213,4 @@
 #define SCNXLEAST64  "llX"
 
 #define SCNXMAX   "llX"
-#define SCNXPTR   "llX"
\ No newline at end of file
+#define SCNXPTR   "llX"
diff --git a/src/extras/screendroplets.h b/src/extras/screendroplets.h
index 090b1923..c47e2f03 100644
--- a/src/extras/screendroplets.h
+++ b/src/extras/screendroplets.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SCREENDROPLETS_H__
+#define __GTA_SCREENDROPLETS_H__
 
 #ifdef SCREEN_DROPLETS
 
@@ -76,3 +77,5 @@ public:
 };
 
 #endif
+
+#endif // __GTA_SCREENDROPLETS_H__
diff --git a/src/fakerw/rpanisot.h b/src/fakerw/rpanisot.h
index a886512f..86c9b9ea 100644
--- a/src/fakerw/rpanisot.h
+++ b/src/fakerw/rpanisot.h
@@ -1,6 +1,9 @@
-#pragma once
+#ifndef __GTA_RPANISOT_H__
+#define __GTA_RPANISOT_H__
 
 RwInt8      RpAnisotGetMaxSupportedMaxAnisotropy(void);
 RwTexture    *RpAnisotTextureSetMaxAnisotropy(RwTexture *tex, RwInt8 val);
 RwInt8       RpAnisotTextureGetMaxAnisotropy(RwTexture *tex);
 RwBool       RpAnisotPluginAttach(void);
+
+#endif // __GTA_RPANISOT_H__
diff --git a/src/fakerw/rphanim.h b/src/fakerw/rphanim.h
index 63059800..e0b109df 100644
--- a/src/fakerw/rphanim.h
+++ b/src/fakerw/rphanim.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RPHANIM_H__
+#define __GTA_RPHANIM_H__
 
 #include "rtquat.h"
 
@@ -70,3 +71,5 @@ RwBool RpHAnimHierarchyUpdateMatrices(RpHAnimHierarchy *hierarchy);
 RpHAnimAnimation *RpHAnimAnimationCreate(RwInt32 typeID, RwInt32 numFrames, RwInt32 flags, RwReal duration);
 RpHAnimAnimation  *RpHAnimAnimationDestroy(RpHAnimAnimation *animation);
 RpHAnimAnimation  *RpHAnimAnimationStreamRead(RwStream *stream);
+
+#endif // __GTA_RPHANIM_H__
diff --git a/src/fakerw/rpmatfx.h b/src/fakerw/rpmatfx.h
index 87c8fb2e..280d5e01 100644
--- a/src/fakerw/rpmatfx.h
+++ b/src/fakerw/rpmatfx.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RPMATFX_H__
+#define __GTA_RPMATFX_H__
 
 enum RpMatFXMaterialFlags
 {
@@ -41,3 +42,5 @@ RpMaterial *RpMatFXMaterialSetDualTexture( RpMaterial *material, RwTexture *text
 RpMaterial *RpMatFXMaterialSetDualBlendModes( RpMaterial *material, RwBlendFunction srcBlendMode, RwBlendFunction dstBlendMode );
 RwTexture *RpMatFXMaterialGetDualTexture( const RpMaterial *material );
 const RpMaterial *RpMatFXMaterialGetDualBlendModes( const RpMaterial *material, RwBlendFunction *srcBlendMode, RwBlendFunction *dstBlendMode );
+
+#endif // __GTA_RPMATFX_H__
diff --git a/src/fakerw/rpskin.h b/src/fakerw/rpskin.h
index 1ffc9f27..b861f83a 100644
--- a/src/fakerw/rpskin.h
+++ b/src/fakerw/rpskin.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RPSKIN_H__
+#define __GTA_RPSKIN_H__
 
 #include <rphanim.h>
 
@@ -24,3 +25,5 @@ RpSkin *RpSkinGeometryGetSkin( RpGeometry *geometry );
 
 RpAtomic *RpSkinAtomicSetHAnimHierarchy( RpAtomic *atomic, RpHAnimHierarchy *hierarchy );
 RpHAnimHierarchy *RpSkinAtomicGetHAnimHierarchy( const RpAtomic *atomic );
+
+#endif // __GTA_RPSKIN_H__
diff --git a/src/fakerw/rpworld.h b/src/fakerw/rpworld.h
index f10a3754..ca86b728 100644
--- a/src/fakerw/rpworld.h
+++ b/src/fakerw/rpworld.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RPWORLD_H__
+#define __GTA_RPWORLD_H__
 
 #define rpATOMIC rw::Atomic::ID
 #define rpCLUMP rw::Clump::ID
@@ -334,3 +335,5 @@ RwCamera *RwCameraForAllClumpsNotInFrustum(RwCamera *camera, RwInt32 numClumps,
 //RpWorldSector *RpWorldSectorForAllAtomics(RpWorldSector *sector, RpAtomicCallBack callback, void *data);
 //RpWorldSector *RpWorldSectorForAllCollisionAtomics(RpWorldSector *sector, RpAtomicCallBack callback, void *data);
 //RpWorldSector *RpWorldSectorForAllLights(RpWorldSector *sector, RpLightCallBack callback, void *data);
+
+#endif // __GTA_RPWORLD_H__
diff --git a/src/fakerw/rtbmp.h b/src/fakerw/rtbmp.h
index 896d276b..18a501fb 100644
--- a/src/fakerw/rtbmp.h
+++ b/src/fakerw/rtbmp.h
@@ -1,4 +1,7 @@
-#pragma once
+#ifndef __GTA_RTBMP_H__
+#define __GTA_RTBMP_H__
 
 RwImage *RtBMPImageWrite(RwImage * image, const RwChar * imageName);
 RwImage *RtBMPImageRead(const RwChar * imageName);
+
+#endif // __GTA_RTBMP_H__
diff --git a/src/fakerw/rtcharse.h b/src/fakerw/rtcharse.h
index 10eb1f32..73d89553 100644
--- a/src/fakerw/rtcharse.h
+++ b/src/fakerw/rtcharse.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RTCHARSE_H__
+#define __GTA_RTCHARSE_H__
 
 typedef rw::Charset RtCharset;
 typedef rw::Charset::Desc RtCharsetDesc;
@@ -12,3 +13,5 @@ RtCharset   *RtCharsetSetColors(RtCharset * charSet, const RwRGBA * foreGround,
 RtCharset   *RtCharsetGetDesc(RtCharset * charset, RtCharsetDesc * desc);
 RtCharset   *RtCharsetCreate(const RwRGBA * foreGround, const RwRGBA * backGround);
 RwBool       RtCharsetDestroy(RtCharset * charSet);
+
+#endif // __GTA_RTCHARSE_H__
diff --git a/src/fakerw/rtpng.h b/src/fakerw/rtpng.h
index 80f29020..f82957bd 100644
--- a/src/fakerw/rtpng.h
+++ b/src/fakerw/rtpng.h
@@ -1,4 +1,7 @@
-#pragma once
+#ifndef __GTA_RTPNG_H__
+#define __GTA_RTPNG_H__
 
 RwImage *RtPNGImageWrite(RwImage * image, const RwChar * imageName);
 RwImage *RtPNGImageRead(const RwChar * imageName);
+
+#endif // __GTA_RTPNG_H__
diff --git a/src/fakerw/rtquat.h b/src/fakerw/rtquat.h
index 450342b2..76112ae5 100644
--- a/src/fakerw/rtquat.h
+++ b/src/fakerw/rtquat.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RTQUAT_H__
+#define __GTA_RTQUAT_H__
 
 // Same layout as rw::Quat but with ugly imag,real separation which i don't want in librw
 struct RtQuat
@@ -13,3 +14,5 @@ const RtQuat *RtQuatQueryRotate(const RtQuat *quat, RwV3d * unitAxis, RwReal * a
 RwV3d *RtQuatTransformVectors(RwV3d * vectorsOut, const RwV3d * vectorsIn, const RwInt32 numPoints, const RtQuat *quat);
 
 void RtQuatConvertToMatrix(const RtQuat * const qpQuat, RwMatrix * const mpMatrix);
+
+#endif // __GTA_RTQUAT_H__
diff --git a/src/fakerw/rwcore.h b/src/fakerw/rwcore.h
index ab0a719f..60deb61c 100644
--- a/src/fakerw/rwcore.h
+++ b/src/fakerw/rwcore.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RWCORE_H__
+#define __GTA_RWCORE_H__
 
 #define RWCORE_H	// needed by CVector
 
@@ -421,3 +422,5 @@ void RwD3D8EngineSetRefreshRate(RwUInt32 refreshRate);
 RwBool RwD3D8DeviceSupportsDXTTexture(void);
 void RwD3D8EngineSetMultiSamplingLevels(RwUInt32 level);
 RwUInt32 RwD3D8EngineGetMaxMultiSamplingLevels(void);
+
+#endif // __GTA_RWCORE_H__
diff --git a/src/fakerw/rwplcore.h b/src/fakerw/rwplcore.h
index 69c921cc..93a21b89 100644
--- a/src/fakerw/rwplcore.h
+++ b/src/fakerw/rwplcore.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RWPLCORE_H__
+#define __GTA_RWPLCORE_H__
 
 typedef rw::int8 RwInt8;
 typedef rw::int16 RwInt16;
@@ -496,3 +497,5 @@ RwInt32 RwEngineGetMaxTextureSize(void);
  */
 
 RwBool RwStreamFindChunk(RwStream *stream, RwUInt32 type, RwUInt32 *lengthOut, RwUInt32 *versionOut);
+
+#endif // __GTA_RWPLCORE_H__
diff --git a/src/math/Matrix.cpp b/src/math/Matrix.cpp
index c0d909cb..eafcf3f2 100644
--- a/src/math/Matrix.cpp
+++ b/src/math/Matrix.cpp
@@ -528,4 +528,4 @@ CCompressedMatrixNotAligned::DecompressIntoFullMatrix(CMatrix &other)
 	other.GetUp() = CrossProduct(other.GetRight(), other.GetForward());
 	other.GetPosition() = m_vecPos;
 	other.Reorthogonalise();
-}
\ No newline at end of file
+}
diff --git a/src/math/Matrix.h b/src/math/Matrix.h
index 0adcf32c..13377d21 100644
--- a/src/math/Matrix.h
+++ b/src/math/Matrix.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MATRIX_H__
+#define __GTA_MATRIX_H__
 
 class CMatrix
 {
@@ -151,4 +152,6 @@ public:
 class CCompressedMatrix : public CCompressedMatrixNotAligned
 {
 	int _alignment; // no clue what would this align to
-};
\ No newline at end of file
+};
+
+#endif // __GTA_MATRIX_H__
diff --git a/src/math/Quaternion.cpp b/src/math/Quaternion.cpp
index b0e782e2..6128f58d 100644
--- a/src/math/Quaternion.cpp
+++ b/src/math/Quaternion.cpp
@@ -174,4 +174,4 @@ CQuaternion::Set(float f1, float f2, float f3)
 	y = ((s1 * c2) * c3) + ((s2 * c1) * s3);
 	z = ((s2 * c1) * c3) - ((s1 * c2) * s3);
 	w = ((c2 * c1) * c3) + ((s2 * s1) * s3);
-}
\ No newline at end of file
+}
diff --git a/src/math/Quaternion.h b/src/math/Quaternion.h
index 47c94f7c..502b2b0b 100644
--- a/src/math/Quaternion.h
+++ b/src/math/Quaternion.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_QUATERNION_H__
+#define __GTA_QUATERNION_H__
 
 // TODO: actually implement this
 class CQuaternion
@@ -93,3 +94,5 @@ inline CQuaternion operator/(const CQuaternion &left, float right)
 {
 	return CQuaternion(left.x / right, left.y / right, left.z / right, left.w / right);
 }
+
+#endif // __GTA_QUATERNION_H__
diff --git a/src/math/Rect.cpp b/src/math/Rect.cpp
index de6320ad..8b41dc20 100644
--- a/src/math/Rect.cpp
+++ b/src/math/Rect.cpp
@@ -14,4 +14,4 @@ CRect::CRect(float l, float t, float r, float b)
 	top = t;
 	right = r;
 	bottom = b;
-}
\ No newline at end of file
+}
diff --git a/src/math/Rect.h b/src/math/Rect.h
index e9b25896..248c3410 100644
--- a/src/math/Rect.h
+++ b/src/math/Rect.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RECT_H__
+#define __GTA_RECT_H__
 
 class CRect
 {
@@ -69,3 +70,5 @@ public:
 	float GetWidth(void) { return right - left; }
 	float GetHeight(void) { return bottom - top; }
 };
+
+#endif // __GTA_RECT_H__
diff --git a/src/math/Vector.h b/src/math/Vector.h
index 02128454..c5bf892e 100644
--- a/src/math/Vector.h
+++ b/src/math/Vector.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_VECTOR_H__
+#define __GTA_VECTOR_H__
 
 class CVector : public RwV3d
 {
@@ -126,4 +127,6 @@ class CMatrix;
 
 CVector Multiply3x3(const CMatrix &mat, const CVector &vec);
 CVector Multiply3x3(const CVector &vec, const CMatrix &mat);
-CVector operator*(const CMatrix &mat, const CVector &vec);
\ No newline at end of file
+CVector operator*(const CMatrix &mat, const CVector &vec);
+
+#endif // __GTA_VECTOR_H__
diff --git a/src/math/Vector2D.h b/src/math/Vector2D.h
index deabd0b1..a437437f 100644
--- a/src/math/Vector2D.h
+++ b/src/math/Vector2D.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_VECTOR2D_H__
+#define __GTA_VECTOR2D_H__
 
 class CVector2D
 {
@@ -102,3 +103,5 @@ inline CVector2D operator*(float left, const CVector2D &right)
 {
 	return CVector2D(left * right.x, left * right.y);
 }
+
+#endif // __GTA_VECTOR2D_H__
diff --git a/src/math/VuVector.h b/src/math/VuVector.h
index 41584095..fbcbe689 100644
--- a/src/math/VuVector.h
+++ b/src/math/VuVector.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_VUVECTOR_H__
+#define __GTA_VUVECTOR_H__
 
 class TYPEALIGN(16) CVuVector : public CVector
 {
@@ -30,3 +31,5 @@ void TransformPoint(CVuVector &out, const CMatrix &mat, const CVuVector &in);
 void TransformPoint(CVuVector &out, const CMatrix &mat, const RwV3d &in);
 void TransformPoints(CVuVector *out, int n, const CMatrix &mat, const RwV3d *in, int stride);
 void TransformPoints(CVuVector *out, int n, const CMatrix &mat, const CVuVector *in);
+
+#endif // __GTA_VUVECTOR_H__
diff --git a/src/math/maths.h b/src/math/maths.h
index 6a228036..ccb6c913 100644
--- a/src/math/maths.h
+++ b/src/math/maths.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MATHS_H__
+#define __GTA_MATHS_H__
 
 // wrapper around float versions of functions
 // in gta they are in CMaths but that makes the code rather noisy
@@ -17,3 +18,5 @@ inline float RecipSqrt(float x) { return RecipSqrt(1.0f, x); }
 inline float Pow(float x, float y) { return powf(x, y); }
 inline float Floor(float x) { return floorf(x); }
 inline float Ceil(float x) { return ceilf(x); }
+
+#endif // __GTA_MATHS_H__
diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h
index 2d1dc8ac..8b9828fb 100644
--- a/src/modelinfo/BaseModelInfo.h
+++ b/src/modelinfo/BaseModelInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_BASEMODELINFO_H__
+#define __GTA_BASEMODELINFO_H__
 
 struct CColModel;
 
@@ -72,3 +73,5 @@ public:
 	uint8 GetNum2dEffects() const { return m_num2dEffects; }
 	uint16 GetNumRefs() const { return m_refCount; }
 };
+
+#endif // __GTA_BASEMODELINFO_H__
diff --git a/src/modelinfo/ClumpModelInfo.h b/src/modelinfo/ClumpModelInfo.h
index 0113d340..14f9ad54 100644
--- a/src/modelinfo/ClumpModelInfo.h
+++ b/src/modelinfo/ClumpModelInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CLUMPMODELINFO_H__
+#define __GTA_CLUMPMODELINFO_H__
 
 #include "BaseModelInfo.h"
 
@@ -58,3 +59,5 @@ public:
 	static RwFrame *GetFrameFromId(RpClump *clump, int32 id);
 };
 //static_assert(sizeof(CClumpModelInfo) == 0x34, "CClumpModelInfo: error");
+
+#endif // __GTA_CLUMPMODELINFO_H__
diff --git a/src/modelinfo/MloModelInfo.cpp b/src/modelinfo/MloModelInfo.cpp
index fa12b900..6bd62c96 100644
--- a/src/modelinfo/MloModelInfo.cpp
+++ b/src/modelinfo/MloModelInfo.cpp
@@ -38,4 +38,4 @@ CMloModelInfo::ConstructClump()
 		m_clump = nil;
 	}
 }
-*/
\ No newline at end of file
+*/
diff --git a/src/modelinfo/MloModelInfo.h b/src/modelinfo/MloModelInfo.h
index b1ae3298..3ea5f4e7 100644
--- a/src/modelinfo/MloModelInfo.h
+++ b/src/modelinfo/MloModelInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MLOMODELINFO_H__
+#define __GTA_MLOMODELINFO_H__
 
 #include "ClumpModelInfo.h"
 
@@ -11,4 +12,6 @@ public:
 public:
 	CMloModelInfo(void) : CClumpModelInfo(MITYPE_MLO) {}
 	void ConstructClump();
-};
\ No newline at end of file
+};
+
+#endif // __GTA_MLOMODELINFO_H__
diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h
index 836c4092..038242e4 100644
--- a/src/modelinfo/ModelIndices.h
+++ b/src/modelinfo/ModelIndices.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MODELINDICES_H__
+#define __GTA_MODELINDICES_H__
 
 #include "ModelInfo.h"
 
@@ -619,3 +620,5 @@ IsFence(int16 id)
 	return id == MI_FENCE ||
 		id == MI_FENCE2;
 }
+
+#endif // __GTA_MODELINDICES_H__
diff --git a/src/modelinfo/ModelInfo.h b/src/modelinfo/ModelInfo.h
index a0ee0015..31240430 100644
--- a/src/modelinfo/ModelInfo.h
+++ b/src/modelinfo/ModelInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MODELINFO_H__
+#define __GTA_MODELINFO_H__
 
 #include "2dEffect.h"
 #include "SimpleModelInfo.h"
@@ -50,3 +51,5 @@ public:
 	static bool IsPlaneModel(int32 id);
 	static void ReInit2dEffects();
 };
+
+#endif // __GTA_MODELINFO_H__
diff --git a/src/modelinfo/PedModelInfo.h b/src/modelinfo/PedModelInfo.h
index 79bd7eaa..ad7bb6ef 100644
--- a/src/modelinfo/PedModelInfo.h
+++ b/src/modelinfo/PedModelInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PEDMODELINFO_H__
+#define __GTA_PEDMODELINFO_H__
 
 #include "ClumpModelInfo.h"
 #include "ColModel.h"
@@ -50,3 +51,5 @@ public:
 	CColModel *AnimatePedColModelSkinned(RpClump *clump);
 	CColModel *AnimatePedColModelSkinnedWorld(RpClump *clump);
 };
+
+#endif // __GTA_PEDMODELINFO_H__
diff --git a/src/modelinfo/SimpleModelInfo.h b/src/modelinfo/SimpleModelInfo.h
index 986cb886..89698b2f 100644
--- a/src/modelinfo/SimpleModelInfo.h
+++ b/src/modelinfo/SimpleModelInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SIMPLEMODELINFO_H__
+#define __GTA_SIMPLEMODELINFO_H__
 
 #include "BaseModelInfo.h"
 
@@ -59,3 +60,5 @@ public:
 		m_atomics[2] = (RpAtomic*)m; }
 };
 //static_assert(sizeof(CSimpleModelInfo) == 0x4C, "CSimpleModelInfo: error");
+
+#endif // __GTA_SIMPLEMODELINFO_H__
diff --git a/src/modelinfo/TimeModelInfo.h b/src/modelinfo/TimeModelInfo.h
index 6e3c64fb..1b3b9b33 100644
--- a/src/modelinfo/TimeModelInfo.h
+++ b/src/modelinfo/TimeModelInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TIMEMODELINFO_H__
+#define __GTA_TIMEMODELINFO_H__
 
 #include "SimpleModelInfo.h"
 
@@ -18,3 +19,5 @@ public:
 	CTimeModelInfo *FindOtherTimeModel(void);
 };
 //static_assert(sizeof(CTimeModelInfo) == 0x58, "CTimeModelInfo: error");
+
+#endif // __GTA_TIMEMODELINFO_H__
diff --git a/src/modelinfo/VehicleModelInfo.h b/src/modelinfo/VehicleModelInfo.h
index c7a41126..ec9f6a0d 100644
--- a/src/modelinfo/VehicleModelInfo.h
+++ b/src/modelinfo/VehicleModelInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_VEHICLEMODELINFO_H__
+#define __GTA_VEHICLEMODELINFO_H__
 
 #include "ClumpModelInfo.h"
 
@@ -164,3 +165,5 @@ public:
 
 extern bool gbBlackCars;
 extern bool gbPinkCars;
+
+#endif // __GTA_VEHICLEMODELINFO_H__
diff --git a/src/modelinfo/WeaponModelInfo.h b/src/modelinfo/WeaponModelInfo.h
index 548bf8a6..4bff0065 100644
--- a/src/modelinfo/WeaponModelInfo.h
+++ b/src/modelinfo/WeaponModelInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_WEAPONMODELINFO_H__
+#define __GTA_WEAPONMODELINFO_H__
 
 #include "SimpleModelInfo.h"
 #include "WeaponType.h"
@@ -21,3 +22,5 @@ public:
 	void SetWeaponInfo(int32 weaponId);
 	eWeaponType GetWeaponInfo(void);
 };
+
+#endif // __GTA_WEAPONMODELINFO_H__
diff --git a/src/objects/CutsceneObject.h b/src/objects/CutsceneObject.h
index af24c0a6..59b28c96 100644
--- a/src/objects/CutsceneObject.h
+++ b/src/objects/CutsceneObject.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CUTSCENEOBJECT_H__
+#define __GTA_CUTSCENEOBJECT_H__
 
 #include "Object.h"
 
@@ -22,3 +23,5 @@ public:
 	bool SetupLighting(void);
 	void RemoveLighting(bool reset);
 };
+
+#endif // __GTA_CUTSCENEOBJECT_H__
diff --git a/src/objects/DummyObject.h b/src/objects/DummyObject.h
index 680df685..8116b528 100644
--- a/src/objects/DummyObject.h
+++ b/src/objects/DummyObject.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DUMMYOBJECT_H__
+#define __GTA_DUMMYOBJECT_H__
 
 #include "Dummy.h"
 
@@ -10,3 +11,5 @@ public:
 	CDummyObject(void) {}
 	CDummyObject(CObject *obj);
 };
+
+#endif // __GTA_DUMMYOBJECT_H__
diff --git a/src/objects/Object.h b/src/objects/Object.h
index f59379bf..ce870a87 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_OBJECT_H__
+#define __GTA_OBJECT_H__
 
 #include "Physical.h"
 
@@ -114,3 +115,5 @@ public:
 };
 
 bool IsObjectPointerValid(CObject* pObject);
+
+#endif // __GTA_OBJECT_H__
diff --git a/src/objects/ObjectData.h b/src/objects/ObjectData.h
index e25c1aeb..ee09f89e 100644
--- a/src/objects/ObjectData.h
+++ b/src/objects/ObjectData.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_OBJECTDATA_H__
+#define __GTA_OBJECTDATA_H__
 
 class CObject;
 
@@ -25,3 +26,5 @@ public:
 	static void Initialise(const char *filename);
 	static void SetObjectData(int32 modelId, CObject &object);
 };
+
+#endif // __GTA_OBJECTDATA_H__
diff --git a/src/objects/ParticleObject.h b/src/objects/ParticleObject.h
index f199e533..06a299f9 100644
--- a/src/objects/ParticleObject.h
+++ b/src/objects/ParticleObject.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PARTICLEOBJECT_H__
+#define __GTA_PARTICLEOBJECT_H__
 
 #include "AudioManager.h"
 #include "ParticleType.h"
@@ -109,4 +110,6 @@ public:
 	static void Remove(CParticleObject *particleobject);
 
 	static CAudioHydrant *Get(int n);	// for neo screen droplets
-};
\ No newline at end of file
+};
+
+#endif // __GTA_PARTICLEOBJECT_H__
diff --git a/src/objects/Projectile.h b/src/objects/Projectile.h
index 4b3eb4b8..ea367390 100644
--- a/src/objects/Projectile.h
+++ b/src/objects/Projectile.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PROJECTILE_H__
+#define __GTA_PROJECTILE_H__
 
 #include "Object.h"
 
@@ -7,3 +8,5 @@ class CProjectile : public CObject
 public:
 	CProjectile(int32);
 };
+
+#endif // __GTA_PROJECTILE_H__
diff --git a/src/objects/Stinger.cpp b/src/objects/Stinger.cpp
index d3eee416..13534ba4 100644
--- a/src/objects/Stinger.cpp
+++ b/src/objects/Stinger.cpp
@@ -256,4 +256,4 @@ CStinger::Process()
 #endif
 	}
 	CheckForBurstTyres();
-}
\ No newline at end of file
+}
diff --git a/src/objects/Stinger.h b/src/objects/Stinger.h
index 250cf62d..084d7ee0 100644
--- a/src/objects/Stinger.h
+++ b/src/objects/Stinger.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_STINGER_H__
+#define __GTA_STINGER_H__
 
 #include "Object.h"
 
@@ -37,4 +38,6 @@ public:
 	void Deploy(CPed *pPed);
 	void CheckForBurstTyres();
 	void Process();
-};
\ No newline at end of file
+};
+
+#endif // __GTA_STINGER_H__
diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp
index f3511366..84783ff0 100644
--- a/src/peds/CivilianPed.cpp
+++ b/src/peds/CivilianPed.cpp
@@ -607,4 +607,4 @@ CCivilianPed::IsOnStealWishList(int32 model)
 		}
 	}
 	return false;
-}
\ No newline at end of file
+}
diff --git a/src/peds/CivilianPed.h b/src/peds/CivilianPed.h
index dcd49a96..0ea125d3 100644
--- a/src/peds/CivilianPed.h
+++ b/src/peds/CivilianPed.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CIVILIANPED_H__
+#define __GTA_CIVILIANPED_H__
 
 #include "Ped.h"
 
@@ -24,3 +25,5 @@ public:
 	bool IsOnStealWishList(int32);
 };
 //VALIDATE_SIZE(CCivilianPed, 0x53C);
+
+#endif // __GTA_CIVILIANPED_H__
diff --git a/src/peds/CopPed.h b/src/peds/CopPed.h
index 3f5ae06d..91d15694 100644
--- a/src/peds/CopPed.h
+++ b/src/peds/CopPed.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_COPPED_H__
+#define __GTA_COPPED_H__
 #include "Ped.h"
 
 enum eCopType
@@ -49,3 +50,5 @@ public:
 };
 
 VALIDATE_SIZE(CCopPed, 0x62C);
+
+#endif // __GTA_COPPED_H__
diff --git a/src/peds/DummyPed.h b/src/peds/DummyPed.h
index cace4ead..a1430671 100644
--- a/src/peds/DummyPed.h
+++ b/src/peds/DummyPed.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DUMMYPED_H__
+#define __GTA_DUMMYPED_H__
 
 #include "Dummy.h"
 
@@ -8,3 +9,5 @@ class CDummyPed : CDummy
 	int32 pedType;
 	int32 unknown;
 };
+
+#endif // __GTA_DUMMYPED_H__
diff --git a/src/peds/EmergencyPed.h b/src/peds/EmergencyPed.h
index 41bc86e5..b95327b8 100644
--- a/src/peds/EmergencyPed.h
+++ b/src/peds/EmergencyPed.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_EMERGENCYPED_H__
+#define __GTA_EMERGENCYPED_H__
 
 #include "Ped.h"
 
@@ -37,3 +38,5 @@ public:
 	void MedicAI(void);
 };
 //VALIDATE_SIZE(CEmergencyPed, 0x554);
+
+#endif // __GTA_EMERGENCYPED_H__
diff --git a/src/peds/Gangs.h b/src/peds/Gangs.h
index c6381343..14c4a735 100644
--- a/src/peds/Gangs.h
+++ b/src/peds/Gangs.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_GANGS_H__
+#define __GTA_GANGS_H__
 
 #include "PedType.h"
 
@@ -55,3 +56,5 @@ private:
 	static CGangInfo Gang[NUM_GANGS];
 	static bool GangAttackWithCops[NUM_GANGS];
 };
+
+#endif // __GTA_GANGS_H__
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 26cdf03f..50f93370 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PED_H__
+#define __GTA_PED_H__
 
 #include "RwHelper.h"
 #include "AnimManager.h"
@@ -1190,3 +1191,5 @@ VALIDATE_SIZE(CPed, 0x5F4);
 
 bool IsPedPointerValid(CPed*);
 bool IsPedPointerValid_NotInWorld(CPed*);
+
+#endif // __GTA_PED_H__
diff --git a/src/peds/PedAttractor.h b/src/peds/PedAttractor.h
index c55e4028..4435e70f 100644
--- a/src/peds/PedAttractor.h
+++ b/src/peds/PedAttractor.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PEDATTRACTOR_H__
+#define __GTA_PEDATTRACTOR_H__
 #include "common.h"
 #include <vector>
 
@@ -193,4 +194,6 @@ public:
 	CPedStopAttractor(C2dEffect* pEffect, const CMatrix& matrix, int32 maxpeds, float qdist, float waitTime, float approachTime, float distance, float headingdiff, float posdisp, float headdisp) :
 		CPedAttractor(pEffect, matrix, maxpeds, qdist, waitTime, approachTime, distance, headingdiff, posdisp, headdisp)
 	{};
-};
\ No newline at end of file
+};
+
+#endif // __GTA_PEDATTRACTOR_H__
diff --git a/src/peds/PedChat.cpp b/src/peds/PedChat.cpp
index ec6719c6..a27d4891 100644
--- a/src/peds/PedChat.cpp
+++ b/src/peds/PedChat.cpp
@@ -150,4 +150,4 @@ CPed::Say(uint16 audio)
 			m_queuedSound = audio;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/peds/PedDebug.cpp b/src/peds/PedDebug.cpp
index 0dbabb58..39c4b1d2 100644
--- a/src/peds/PedDebug.cpp
+++ b/src/peds/PedDebug.cpp
@@ -346,4 +346,4 @@ CPed::DebugRenderClosePedText()
 {
 	// TODO: mobile code
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/peds/PedIK.h b/src/peds/PedIK.h
index 3011dd5f..1bc9af91 100644
--- a/src/peds/PedIK.h
+++ b/src/peds/PedIK.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PEDIK_H__
+#define __GTA_PEDIK_H__
 #include "common.h"
 #include "AnimBlendClumpData.h"
 
@@ -64,3 +65,5 @@ public:
 };
 
 VALIDATE_SIZE(CPedIK, 0x28);
+
+#endif // __GTA_PEDIK_H__
diff --git a/src/peds/PedPlacement.h b/src/peds/PedPlacement.h
index d1b0cd16..89d942cd 100644
--- a/src/peds/PedPlacement.h
+++ b/src/peds/PedPlacement.h
@@ -1,8 +1,11 @@
-#pragma once
+#ifndef __GTA_PEDPLACEMENT_H__
+#define __GTA_PEDPLACEMENT_H__
 
 class CPedPlacement {
 public:
 	static bool FindZCoorForPed(CVector* pos);
 	static CEntity* IsPositionClearOfCars(Const CVector*);
 	static bool IsPositionClearForPed(const CVector& pos, float radius = -1.0f, int total = -1, CEntity** entities = nil);
-};
\ No newline at end of file
+};
+
+#endif // __GTA_PEDPLACEMENT_H__
diff --git a/src/peds/PedRoutes.h b/src/peds/PedRoutes.h
index c478e38d..2dce48fc 100644
--- a/src/peds/PedRoutes.h
+++ b/src/peds/PedRoutes.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PEDROUTES_H__
+#define __GTA_PEDROUTES_H__
 
 class CRouteNode
 {
@@ -13,3 +14,5 @@ public:
 	static void RemoveRoute(int16);
 	static void Initialise(void);
 };
+
+#endif // __GTA_PEDROUTES_H__
diff --git a/src/peds/PedType.h b/src/peds/PedType.h
index a4698bbb..d26fc3bd 100644
--- a/src/peds/PedType.h
+++ b/src/peds/PedType.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PEDTYPE_H__
+#define __GTA_PEDTYPE_H__
 
 // Index into the PedType array
 enum ePedType
@@ -176,3 +177,5 @@ public:
 };
 
 VALIDATE_SIZE(CPedStats, 0x34);
+
+#endif // __GTA_PEDTYPE_H__
diff --git a/src/peds/PlayerPed.h b/src/peds/PlayerPed.h
index 30b67199..3adb3341 100644
--- a/src/peds/PlayerPed.h
+++ b/src/peds/PlayerPed.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PLAYERPED_H__
+#define __GTA_PLAYERPED_H__
 
 #include "Ped.h"
 
@@ -118,3 +119,5 @@ public:
 };
 
 //VALIDATE_SIZE(CPlayerPed, 0x5F0);
+
+#endif // __GTA_PLAYERPED_H__
diff --git a/src/peds/Population.h b/src/peds/Population.h
index 8c58f1b6..7e211c16 100644
--- a/src/peds/Population.h
+++ b/src/peds/Population.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_POPULATION_H__
+#define __GTA_POPULATION_H__
 
 #include "Game.h"
 #include "PedType.h"
@@ -86,3 +87,5 @@ public:
 	static void PlaceMallPedsAsStationaryGroup(CVector const&, int32);
 	static CPed* AddDeadPedInFrontOfCar(const CVector& pos, CVehicle* pCulprit);
 };
+
+#endif // __GTA_POPULATION_H__
diff --git a/src/renderer/2dEffect.h b/src/renderer/2dEffect.h
index 8ad2b946..1350fd09 100644
--- a/src/renderer/2dEffect.h
+++ b/src/renderer/2dEffect.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_2DEFFECT_H__
+#define __GTA_2DEFFECT_H__
 
 enum {
 	EFFECT_LIGHT,
@@ -97,3 +98,5 @@ public:
 };
 
 VALIDATE_SIZE(C2dEffect, 0x34);
+
+#endif // __GTA_2DEFFECT_H__
diff --git a/src/renderer/Antennas.h b/src/renderer/Antennas.h
index 47cb1dad..d7062d26 100644
--- a/src/renderer/Antennas.h
+++ b/src/renderer/Antennas.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_ANTENNAS_H__
+#define __GTA_ANTENNAS_H__
 
 class CAntenna
 {
@@ -23,3 +24,5 @@ public:
 	static void RegisterOne(uint32 id, CVector dir, CVector position, float length);
 	static void Render(void);
 };
+
+#endif // __GTA_ANTENNAS_H__
diff --git a/src/renderer/Clouds.h b/src/renderer/Clouds.h
index ef33030b..eeea2425 100644
--- a/src/renderer/Clouds.h
+++ b/src/renderer/Clouds.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CLOUDS_H__
+#define __GTA_CLOUDS_H__
 
 class CClouds
 {
@@ -21,3 +22,5 @@ public:
 		int16 botred, int16 botgreen, int16 botblue, int16 alpha);
 	static void RenderHorizon(void);
 };
+
+#endif // __GTA_CLOUDS_H__
diff --git a/src/renderer/Console.h b/src/renderer/Console.h
index 9f22236f..2eed7a68 100644
--- a/src/renderer/Console.h
+++ b/src/renderer/Console.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CONSOLE_H__
+#define __GTA_CONSOLE_H__
 
 class CConsole
 {
@@ -24,4 +25,6 @@ public:
 
 extern CConsole TheConsole;
 
-void cprintf(char*, ...);
\ No newline at end of file
+void cprintf(char*, ...);
+
+#endif // __GTA_CONSOLE_H__
diff --git a/src/renderer/Coronas.cpp b/src/renderer/Coronas.cpp
index d9bf88d1..c44e07b4 100644
--- a/src/renderer/Coronas.cpp
+++ b/src/renderer/Coronas.cpp
@@ -956,4 +956,4 @@ CEntity::ProcessLightsForEntity(void)
 			break;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/renderer/Coronas.h b/src/renderer/Coronas.h
index 45f027d8..7bb29ac8 100644
--- a/src/renderer/Coronas.h
+++ b/src/renderer/Coronas.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CORONAS_H__
+#define __GTA_CORONAS_H__
 
 extern RwTexture *gpCoronaTexture[9];
 
@@ -103,3 +104,5 @@ public:
 	static void RenderSunReflection(void);
 	static void DoSunAndMoon(void);
 };
+
+#endif // __GTA_CORONAS_H__
diff --git a/src/renderer/Credits.h b/src/renderer/Credits.h
index e049ce76..d8fc0bef 100644
--- a/src/renderer/Credits.h
+++ b/src/renderer/Credits.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CREDITS_H__
+#define __GTA_CREDITS_H__
 
 class CCredits
 {
@@ -13,3 +14,5 @@ public:
 	static void PrintCreditSpace(float space, uint32 &line);
 	static void PrintCreditText(float scaleX, float scaleY, wchar *text, uint32 &lineoffset, float scrolloffset);
 };
+
+#endif // __GTA_CREDITS_H__
diff --git a/src/renderer/CutsceneShadow.cpp b/src/renderer/CutsceneShadow.cpp
index 8cb33896..940a8084 100644
--- a/src/renderer/CutsceneShadow.cpp
+++ b/src/renderer/CutsceneShadow.cpp
@@ -266,4 +266,4 @@ CCutsceneShadow::DrawBorderAroundTexture(RwRGBA  const& color)
 		m_ResampleCamera.DrawOutlineBorder(color);
 	else
 		m_Camera.DrawOutlineBorder(color);
-}
\ No newline at end of file
+}
diff --git a/src/renderer/CutsceneShadow.h b/src/renderer/CutsceneShadow.h
index a59fe78f..86010d37 100644
--- a/src/renderer/CutsceneShadow.h
+++ b/src/renderer/CutsceneShadow.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CUTSCENESHADOW_H__
+#define __GTA_CUTSCENESHADOW_H__
 #include "ShadowCamera.h"
 
 class CCutsceneShadow
@@ -50,3 +51,5 @@ public:
 	RwTexture *GetShadowRwTexture();
 	void DrawBorderAroundTexture(RwRGBA  const& color);
 };
+
+#endif // __GTA_CUTSCENESHADOW_H__
diff --git a/src/renderer/Draw.cpp b/src/renderer/Draw.cpp
index a5e7504b..cb80c52c 100644
--- a/src/renderer/Draw.cpp
+++ b/src/renderer/Draw.cpp
@@ -110,4 +110,4 @@ float CDraw::ScaleY(float y)
 {
 	return ms_bProperScaling ? y : y * ((float)DEFAULT_SCREEN_HEIGHT/SCREEN_HEIGHT_NTSC);
 }
-#endif 
\ No newline at end of file
+#endif 
diff --git a/src/renderer/Draw.h b/src/renderer/Draw.h
index b96fa813..e61f950f 100644
--- a/src/renderer/Draw.h
+++ b/src/renderer/Draw.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DRAW_H__
+#define __GTA_DRAW_H__
 
 enum eAspectRatio 
 {
@@ -68,3 +69,5 @@ public:
 	static float ScaleY(float y);
 #endif 
 };
+
+#endif // __GTA_DRAW_H__
diff --git a/src/renderer/Fluff.h b/src/renderer/Fluff.h
index 58c8410c..0602989d 100644
--- a/src/renderer/Fluff.h
+++ b/src/renderer/Fluff.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_FLUFF_H__
+#define __GTA_FLUFF_H__
 #include "common.h"
 #include "Vector.h"
 #include "Object.h"
@@ -202,4 +203,6 @@ public:
 	static void Update(void);
 	static void Render(void);
 	static void Init(void);
-};
\ No newline at end of file
+};
+
+#endif // __GTA_FLUFF_H__
diff --git a/src/renderer/Font.cpp b/src/renderer/Font.cpp
index 6ae10011..1f18e67b 100644
--- a/src/renderer/Font.cpp
+++ b/src/renderer/Font.cpp
@@ -1935,4 +1935,4 @@ CFont::character_code(uint8 c)
 	if(c < 128)
 		return c;
 	return foreign_table[c-128];
-}
\ No newline at end of file
+}
diff --git a/src/renderer/Font.h b/src/renderer/Font.h
index 02e7df3b..84f2cea9 100644
--- a/src/renderer/Font.h
+++ b/src/renderer/Font.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_FONT_H__
+#define __GTA_FONT_H__
 
 #include "Sprite2d.h"
 
@@ -215,3 +216,5 @@ public:
 	static bool IsJapaneseFont() { return IsJapanese() && (Details.style == FONT_JAPANESE);  }
 #endif
 };
+
+#endif // __GTA_FONT_H__
diff --git a/src/renderer/Glass.cpp b/src/renderer/Glass.cpp
index b4ec8c7e..215dbfe9 100644
--- a/src/renderer/Glass.cpp
+++ b/src/renderer/Glass.cpp
@@ -1024,4 +1024,4 @@ CGlass::BreakGlassPhysically(CVector pos, float radius)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/renderer/Glass.h b/src/renderer/Glass.h
index f1c85779..dc24e018 100644
--- a/src/renderer/Glass.h
+++ b/src/renderer/Glass.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_GLASS_H__
+#define __GTA_GLASS_H__
 
 class CEntity;
 class CVehicle;
@@ -56,4 +57,6 @@ public:
 	static bool HasGlassBeenShatteredAtCoors(float x, float y, float z);
 	static void FindWindowSectorList(CPtrList &list, float *dist, CEntity **entity, float x, float y, float z);
 	static void BreakGlassPhysically(CVector pos, float radius);
-};
\ No newline at end of file
+};
+
+#endif // __GTA_GLASS_H__
diff --git a/src/renderer/Hud.h b/src/renderer/Hud.h
index a4b9609a..21ffb5e5 100644
--- a/src/renderer/Hud.h
+++ b/src/renderer/Hud.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_HUD_H__
+#define __GTA_HUD_H__
 #include "Sprite2d.h"
 
 #define HELP_MSG_LENGTH 256
@@ -137,3 +138,5 @@ public:
 	static float DrawFadeState(DRAW_FADE_STATE, int);
 	static void ResetWastedText(void);
 };
+
+#endif // __GTA_HUD_H__
diff --git a/src/renderer/Instance.h b/src/renderer/Instance.h
index 693cfdf1..0846480f 100644
--- a/src/renderer/Instance.h
+++ b/src/renderer/Instance.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_INSTANCE_H__
+#define __GTA_INSTANCE_H__
 
 #include "Placeable.h"
 
@@ -12,3 +13,5 @@ public:
 	~CInstance() { }
 	void Shutdown();
 };
+
+#endif // __GTA_INSTANCE_H__
diff --git a/src/renderer/Lines.h b/src/renderer/Lines.h
index f2694fc0..d5c295ce 100644
--- a/src/renderer/Lines.h
+++ b/src/renderer/Lines.h
@@ -1,7 +1,10 @@
-#pragma once
+#ifndef __GTA_LINES_H__
+#define __GTA_LINES_H__
 
 class CLines
 {
 public:
 	static void RenderLineWithClipping(float x1, float y1, float z1, float x2, float y2, float z2, uint32 c1, uint32 c2);
 };
+
+#endif // __GTA_LINES_H__
diff --git a/src/renderer/MBlur.h b/src/renderer/MBlur.h
index 3dc53082..f908c05d 100644
--- a/src/renderer/MBlur.h
+++ b/src/renderer/MBlur.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MBLUR_H__
+#define __GTA_MBLUR_H__
 
 enum FxType
 {
@@ -37,3 +38,5 @@ public:
 	static bool AddRenderFx(RwCamera *cam, RwRect *rect, float z, FxType type);
 	static void OverlayRenderFx(RwCamera *cam, RwRaster *frontBuf);
 };
+
+#endif // __GTA_MBLUR_H__
diff --git a/src/renderer/Occlusion.cpp b/src/renderer/Occlusion.cpp
index ec7101a6..f501ac1d 100644
--- a/src/renderer/Occlusion.cpp
+++ b/src/renderer/Occlusion.cpp
@@ -527,4 +527,4 @@ bool CEntity::IsEntityOccluded(void) {
 	}
 
 	return false;
-}
\ No newline at end of file
+}
diff --git a/src/renderer/Occlusion.h b/src/renderer/Occlusion.h
index e0edef53..8dcabfdd 100644
--- a/src/renderer/Occlusion.h
+++ b/src/renderer/Occlusion.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_OCCLUSION_H__
+#define __GTA_OCCLUSION_H__
 
 struct ActiveOccluderLine {
 	CVector2D origin;
@@ -59,4 +60,6 @@ bool CalcScreenCoors(CVector const &in, CVector *out);
 
 #ifndef MASTER
 extern bool bDispayOccDebugStuff;
-#endif
\ No newline at end of file
+#endif
+
+#endif // __GTA_OCCLUSION_H__
diff --git a/src/renderer/Particle.h b/src/renderer/Particle.h
index 5542dc02..f85e0355 100644
--- a/src/renderer/Particle.h
+++ b/src/renderer/Particle.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PARTICLE_H__
+#define __GTA_PARTICLE_H__
 #include "ParticleMgr.h"
 
 
@@ -106,3 +107,5 @@ extern RwRaster *gpRainDripRaster[];
 extern RwRaster *gpRainDripDarkRaster[];
 
 VALIDATE_SIZE(CParticle, 0x58);
+
+#endif // __GTA_PARTICLE_H__
diff --git a/src/renderer/ParticleMgr.h b/src/renderer/ParticleMgr.h
index f4afc018..ffc908f5 100644
--- a/src/renderer/ParticleMgr.h
+++ b/src/renderer/ParticleMgr.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PARTICLEMGR_H__
+#define __GTA_PARTICLEMGR_H__
 
 #include "ParticleType.h"
 
@@ -136,3 +137,5 @@ public:
 VALIDATE_SIZE(cParticleSystemMgr, 0x2FFC);
 
 extern cParticleSystemMgr mod_ParticleSystemManager;
+
+#endif // __GTA_PARTICLEMGR_H__
diff --git a/src/renderer/ParticleType.h b/src/renderer/ParticleType.h
index 9578083d..6939c1c7 100644
--- a/src/renderer/ParticleType.h
+++ b/src/renderer/ParticleType.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PARTICLETYPE_H__
+#define __GTA_PARTICLETYPE_H__
 
 enum tParticleType
 {
@@ -89,4 +90,6 @@ enum tParticleType
 	MAX_PARTICLES,
 	PARTICLE_FIRST = PARTICLE_SPARK,
 	PARTICLE_LAST = PARTICLE_HEATHAZE_IN_DIST
-};
\ No newline at end of file
+};
+
+#endif // __GTA_PARTICLETYPE_H__
diff --git a/src/renderer/PlayerSkin.h b/src/renderer/PlayerSkin.h
index e0214ce0..f052a536 100644
--- a/src/renderer/PlayerSkin.h
+++ b/src/renderer/PlayerSkin.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PLAYERSKIN_H__
+#define __GTA_PLAYERSKIN_H__
 
 #define DEFAULT_SKIN_NAME "$$\"\""
 
@@ -12,4 +13,6 @@ public:
 	static void BeginFrontendSkinEdit();
 	static void EndFrontendSkinEdit();
 	static void RenderFrontendSkinEdit();
-};
\ No newline at end of file
+};
+
+#endif // __GTA_PLAYERSKIN_H__
diff --git a/src/renderer/PointLights.h b/src/renderer/PointLights.h
index 827200b9..4c2b02c4 100644
--- a/src/renderer/PointLights.h
+++ b/src/renderer/PointLights.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_POINTLIGHTS_H__
+#define __GTA_POINTLIGHTS_H__
 
 class CRegisteredPointLight
 {
@@ -48,3 +49,5 @@ public:
 	static void RenderFogEffect(void);
 	static bool ProcessVerticalLineUsingCache(CVector coors, float *groundZ);
 };
+
+#endif // __GTA_POINTLIGHTS_H__
diff --git a/src/renderer/RenderBuffer.h b/src/renderer/RenderBuffer.h
index a0f3e7b9..d095b499 100644
--- a/src/renderer/RenderBuffer.h
+++ b/src/renderer/RenderBuffer.h
@@ -22,4 +22,4 @@ extern int32 TempBufferVerticesStored;
 extern int32 TempBufferIndicesStored;
 extern VertexBufferUnion TempVertexBuffer;
 #define TempBufferRenderVertices (TempVertexBuffer.im3d)
-extern RwImVertexIndex TempBufferRenderIndexList[TEMPBUFFERINDEXSIZE];
\ No newline at end of file
+extern RwImVertexIndex TempBufferRenderIndexList[TEMPBUFFERINDEXSIZE];
diff --git a/src/renderer/Renderer.h b/src/renderer/Renderer.h
index 9b202098..bc331ee4 100644
--- a/src/renderer/Renderer.h
+++ b/src/renderer/Renderer.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RENDERER_H__
+#define __GTA_RENDERER_H__
 
 class CEntity;
 
@@ -103,3 +104,5 @@ public:
 #endif
 	static void InsertEntityIntoList(CEntity *ent);
 };
+
+#endif // __GTA_RENDERER_H__
diff --git a/src/renderer/Rubbish.h b/src/renderer/Rubbish.h
index 5a4e479b..fe1d08f2 100644
--- a/src/renderer/Rubbish.h
+++ b/src/renderer/Rubbish.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RUBBISH_H__
+#define __GTA_RUBBISH_H__
 
 class CVehicle;
 
@@ -55,3 +56,5 @@ public:
 };
 
 extern RwTexture *gpRubbishTexture[4];
+
+#endif // __GTA_RUBBISH_H__
diff --git a/src/renderer/ShadowCamera.cpp b/src/renderer/ShadowCamera.cpp
index f69c234f..29c17a8e 100644
--- a/src/renderer/ShadowCamera.cpp
+++ b/src/renderer/ShadowCamera.cpp
@@ -546,4 +546,4 @@ RwRaster *CShadowCamera::DrawOutlineBorder(RwRGBA const& color)
 	}
 
 	return raster;
-}
\ No newline at end of file
+}
diff --git a/src/renderer/ShadowCamera.h b/src/renderer/ShadowCamera.h
index a2149db7..e6d575b1 100644
--- a/src/renderer/ShadowCamera.h
+++ b/src/renderer/ShadowCamera.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SHADOWCAMERA_H__
+#define __GTA_SHADOWCAMERA_H__
 
 
 class CShadowCamera
@@ -51,4 +52,6 @@ public:
 	{
 		return m_pCamera;
 	}
-};
\ No newline at end of file
+};
+
+#endif // __GTA_SHADOWCAMERA_H__
diff --git a/src/renderer/Shadows.h b/src/renderer/Shadows.h
index 937ff4eb..29df8a06 100644
--- a/src/renderer/Shadows.h
+++ b/src/renderer/Shadows.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SHADOWS_H__
+#define __GTA_SHADOWS_H__
 
 #define MAX_STOREDSHADOWS    48
 #define MAX_POLYBUNCHES      380
@@ -208,3 +209,5 @@ extern RwTexture *gpWalkDontTex;
 extern RwTexture *gpCrackedGlassTex;
 extern RwTexture *gpPostShadowTex;
 extern RwTexture *gpGoalTex;
+
+#endif // __GTA_SHADOWS_H__
diff --git a/src/renderer/Skidmarks.h b/src/renderer/Skidmarks.h
index 28082f08..1d2a18c6 100644
--- a/src/renderer/Skidmarks.h
+++ b/src/renderer/Skidmarks.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SKIDMARKS_H__
+#define __GTA_SKIDMARKS_H__
 
 enum { SKIDMARK_LENGTH = 16 };
 
@@ -39,3 +40,5 @@ public:
 	static void RegisterOne(uintptr id, const CVector &pos, float fwdX, float fwdY, eSkidmarkType type, bool *isBloody);
 	static void RegisterOne(uintptr id, const CVector &pos, float fwdX, float fwdY, bool *isMuddy, bool *isBloody);
 };
+
+#endif // __GTA_SKIDMARKS_H__
diff --git a/src/renderer/SpecialFX.h b/src/renderer/SpecialFX.h
index f163d8ca..e9091380 100644
--- a/src/renderer/SpecialFX.h
+++ b/src/renderer/SpecialFX.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SPECIALFX_H__
+#define __GTA_SPECIALFX_H__
 
 //file done
 
@@ -247,3 +248,5 @@ public:
 	static void StartBoatFoamAnimation(); //not used
 	static void UpdateBoatFoamAnimation(CMatrix*); //not used
 };
+
+#endif // __GTA_SPECIALFX_H__
diff --git a/src/renderer/Sprite.h b/src/renderer/Sprite.h
index fae6684e..288c96ca 100644
--- a/src/renderer/Sprite.h
+++ b/src/renderer/Sprite.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SPRITE_H__
+#define __GTA_SPRITE_H__
 
 class CSprite
 {
@@ -29,3 +30,5 @@ public:
 	static void RenderBufferedOneXLUSprite2D_Rotate_Dimension(float x, float y, float w, float h, const RwRGBA &colour, int16 intens, float rotation, uint8 alpha);
 
 };
+
+#endif // __GTA_SPRITE_H__
diff --git a/src/renderer/Sprite2d.cpp b/src/renderer/Sprite2d.cpp
index 92f326f8..e02dbe15 100644
--- a/src/renderer/Sprite2d.cpp
+++ b/src/renderer/Sprite2d.cpp
@@ -431,4 +431,4 @@ CSprite2d::RenderVertexBuffer()
 		nextBufferVertex = 0;
 		nextBufferIndex = 0;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/renderer/Sprite2d.h b/src/renderer/Sprite2d.h
index 5abd8d71..7b2610f1 100644
--- a/src/renderer/Sprite2d.h
+++ b/src/renderer/Sprite2d.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SPRITE2D_H__
+#define __GTA_SPRITE2D_H__
 
 class CSprite2d
 {
@@ -52,3 +53,5 @@ public:
 	static void AddToBuffer(const CRect &a1, const CRGBA &a2, float a3, float a4, float a5, float a6, float a7, float a8, float a9, float a10);
 	static void RenderVertexBuffer();
 };
+
+#endif // __GTA_SPRITE2D_H__
diff --git a/src/renderer/TexList.cpp b/src/renderer/TexList.cpp
index 1689837f..5364b472 100644
--- a/src/renderer/TexList.cpp
+++ b/src/renderer/TexList.cpp
@@ -38,4 +38,4 @@ void
 CTexList::LoadGlobalTextureList()
 {
 	CFileMgr::SetDir("TEXTURES");
-}
\ No newline at end of file
+}
diff --git a/src/renderer/TexList.h b/src/renderer/TexList.h
index 7e042211..7f0047ae 100644
--- a/src/renderer/TexList.h
+++ b/src/renderer/TexList.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TEXLIST_H__
+#define __GTA_TEXLIST_H__
 
 class CTexList
 {
@@ -11,4 +12,6 @@ public:
 	static int32 GetFirstFreeTexture();
 	static RwTexture *LoadFileNameTexture(char *name);
 	static void LoadGlobalTextureList();
-};
\ No newline at end of file
+};
+
+#endif // __GTA_TEXLIST_H__
diff --git a/src/renderer/Timecycle.h b/src/renderer/Timecycle.h
index da911b75..d9fbd086 100644
--- a/src/renderer/Timecycle.h
+++ b/src/renderer/Timecycle.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TIMECYCLE_H__
+#define __GTA_TIMECYCLE_H__
 
 class CTimeCycle
 {
@@ -199,3 +200,5 @@ public:
 	static float GetShadowDisplacementX(void) { return m_fShadowDisplacementX[m_CurrentStoredValue]; }
 	static float GetShadowDisplacementY(void) { return m_fShadowDisplacementY[m_CurrentStoredValue]; }
 };
+
+#endif // __GTA_TIMECYCLE_H__
diff --git a/src/renderer/VarConsole.cpp b/src/renderer/VarConsole.cpp
index 372a091a..8243989c 100644
--- a/src/renderer/VarConsole.cpp
+++ b/src/renderer/VarConsole.cpp
@@ -783,4 +783,4 @@ CVarConsole::Check()
 		Process();
 	else if (CPad::GetPad(VAR_CONSOLE_PAD)->GetRightShoulder1JustDown() && CPad::GetPad(VAR_CONSOLE_PAD)->GetLeftShoulder1JustDown())
 		Enter();
-}
\ No newline at end of file
+}
diff --git a/src/renderer/VarConsole.h b/src/renderer/VarConsole.h
index 5179a10d..6709626e 100644
--- a/src/renderer/VarConsole.h
+++ b/src/renderer/VarConsole.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_VARCONSOLE_H__
+#define __GTA_VARCONSOLE_H__
 
 enum eVarConsoleEntryType
 {
@@ -89,4 +90,6 @@ public:
 	void Check();
 };
 
-extern CVarConsole VarConsole;
\ No newline at end of file
+extern CVarConsole VarConsole;
+
+#endif // __GTA_VARCONSOLE_H__
diff --git a/src/renderer/WaterCannon.h b/src/renderer/WaterCannon.h
index a37bdd12..e451fc54 100644
--- a/src/renderer/WaterCannon.h
+++ b/src/renderer/WaterCannon.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_WATERCANNON_H__
+#define __GTA_WATERCANNON_H__
 
 #define WATERCANNON_GRAVITY (0.009f)
 #define WATERCANNON_LIFETIME (150)
@@ -36,4 +37,6 @@ public:
 	static void UpdateOne(uint32 id, CVector *pos, CVector *dir);
 	static void Update();
 	static void Render(void);
-};
\ No newline at end of file
+};
+
+#endif // __GTA_WATERCANNON_H__
diff --git a/src/renderer/WaterCreatures.cpp b/src/renderer/WaterCreatures.cpp
index 92fb74ee..e10da6a3 100644
--- a/src/renderer/WaterCreatures.cpp
+++ b/src/renderer/WaterCreatures.cpp
@@ -272,4 +272,4 @@ void CWaterCreatures::RemoveAll() {
 			nNumActiveSeaLifeForms--;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/renderer/WaterCreatures.h b/src/renderer/WaterCreatures.h
index 32754a10..b9f0ed45 100644
--- a/src/renderer/WaterCreatures.h
+++ b/src/renderer/WaterCreatures.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_WATERCREATURES_H__
+#define __GTA_WATERCREATURES_H__
 
 class CObject;
 
@@ -46,4 +47,6 @@ struct WaterCreatureProperties {
 	float fLevel;
 	float fUnknown; //unused
 	float fWaterDepth;
-};
\ No newline at end of file
+};
+
+#endif // __GTA_WATERCREATURES_H__
diff --git a/src/renderer/WaterLevel.cpp b/src/renderer/WaterLevel.cpp
index 98b03b38..c2aecf97 100644
--- a/src/renderer/WaterLevel.cpp
+++ b/src/renderer/WaterLevel.cpp
@@ -3374,4 +3374,4 @@ CWaterLevel::CreateBeachToy(CVector const &vec, eBeachToy beachtoy)
 		return toy;
 	} else
 		return nil;
-}
\ No newline at end of file
+}
diff --git a/src/renderer/WaterLevel.h b/src/renderer/WaterLevel.h
index 6d6614d8..cee56a1f 100644
--- a/src/renderer/WaterLevel.h
+++ b/src/renderer/WaterLevel.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_WATERLEVEL_H__
+#define __GTA_WATERLEVEL_H__
 
 #define WATER_X_OFFSET (400.0f)
 
@@ -182,3 +183,5 @@ public:
 	static void HandleBeachToysStuff(void);
 	static CEntity *CreateBeachToy(CVector const &vec, eBeachToy beachtoy);
 };
+
+#endif // __GTA_WATERLEVEL_H__
diff --git a/src/renderer/Weather.h b/src/renderer/Weather.h
index bda57d55..0cc86664 100644
--- a/src/renderer/Weather.h
+++ b/src/renderer/Weather.h
@@ -70,4 +70,4 @@ struct tRainStreak
 	uint32 timer;
 };
 
-extern RwTexture* gpRainDropTex;
\ No newline at end of file
+extern RwTexture* gpRainDropTex;
diff --git a/src/renderer/WindModifiers.h b/src/renderer/WindModifiers.h
index 7c2e57bd..f288260e 100644
--- a/src/renderer/WindModifiers.h
+++ b/src/renderer/WindModifiers.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_WINDMODIFIERS_H__
+#define __GTA_WINDMODIFIERS_H__
 
 class CWindModifiers
 {
@@ -9,3 +10,5 @@ public:
 	static void RegisterOne(CVector pos, int32 windSourceType);
 	static bool FindWindModifier(CVector pos, float *x, float *y);
 };
+
+#endif // __GTA_WINDMODIFIERS_H__
diff --git a/src/rw/Lights.h b/src/rw/Lights.h
index ad355adb..cc14451a 100644
--- a/src/rw/Lights.h
+++ b/src/rw/Lights.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_LIGHTS_H__
+#define __GTA_LIGHTS_H__
 
 extern RpLight *pAmbient;
 extern RpLight *pDirect;
@@ -25,3 +26,5 @@ void SetAmbientColoursForPedsCarsAndObjects(void);
 void SetAmbientColoursToIndicateRoadGroup(int i);
 void SetAmbientColours(RwRGBAReal *color);
 void SetFullAmbient(void);
+
+#endif // __GTA_LIGHTS_H__
diff --git a/src/rw/MemoryHeap.h b/src/rw/MemoryHeap.h
index 1a9a51f8..0bc3c824 100644
--- a/src/rw/MemoryHeap.h
+++ b/src/rw/MemoryHeap.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MEMORYHEAP_H__
+#define __GTA_MEMORYHEAP_H__
 
 // some windows shit
 #ifdef MoveMemory
@@ -202,3 +203,5 @@ public:
 };
 
 extern CMemoryHeap gMainHeap;
+
+#endif // __GTA_MEMORYHEAP_H__
diff --git a/src/rw/MemoryMgr.h b/src/rw/MemoryMgr.h
index e2962806..f5369ef3 100644
--- a/src/rw/MemoryMgr.h
+++ b/src/rw/MemoryMgr.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MEMORYMGR_H__
+#define __GTA_MEMORYMGR_H__
 
 extern RwMemoryFunctions memFuncs;
 void InitMemoryMgr(void);
@@ -10,3 +11,5 @@ void MemoryMgrFree(void *ptr);
 
 void *RwMallocAlign(RwUInt32 size, RwUInt32 align);
 void RwFreeAlign(void *mem);
+
+#endif // __GTA_MEMORYMGR_H__
diff --git a/src/rw/NodeName.h b/src/rw/NodeName.h
index 1a3e057b..d17f5a44 100644
--- a/src/rw/NodeName.h
+++ b/src/rw/NodeName.h
@@ -1,4 +1,7 @@
-#pragma once
+#ifndef __GTA_NODENAME_H__
+#define __GTA_NODENAME_H__
 
 bool NodeNamePluginAttach(void);
 char *GetFrameNodeName(RwFrame *frame);
+
+#endif // __GTA_NODENAME_H__
diff --git a/src/rw/RwHelper.h b/src/rw/RwHelper.h
index a3a1928c..98a4d073 100644
--- a/src/rw/RwHelper.h
+++ b/src/rw/RwHelper.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_RWHELPER_H__
+#define __GTA_RWHELPER_H__
 
 extern bool bDebugRenderGroups;
 extern bool gPS2alphaTest;
@@ -61,4 +62,6 @@ void RestoreAlphaTest();
 #else
 #define SetAlphaTest(a) (0)
 #define RestoreAlphaTest() (0)
-#endif
\ No newline at end of file
+#endif
+
+#endif // __GTA_RWHELPER_H__
diff --git a/src/rw/RwPS2AlphaTest.cpp b/src/rw/RwPS2AlphaTest.cpp
index c0d68355..a9793574 100644
--- a/src/rw/RwPS2AlphaTest.cpp
+++ b/src/rw/RwPS2AlphaTest.cpp
@@ -244,4 +244,4 @@ ReplaceAtomicPipeCallback()
 
 #endif // PS2_ALPHA_TEST
 
-#endif // !LIBRW
\ No newline at end of file
+#endif // !LIBRW
diff --git a/src/rw/TexturePools.cpp b/src/rw/TexturePools.cpp
index c2ba6cf9..a50c2056 100644
--- a/src/rw/TexturePools.cpp
+++ b/src/rw/TexturePools.cpp
@@ -218,4 +218,4 @@ _TexturePoolsShutdown()
 	PaletteList.Free();
 }
 
-#endif // !LIBRW
\ No newline at end of file
+#endif // !LIBRW
diff --git a/src/rw/TexturePools.h b/src/rw/TexturePools.h
index 75187432..f2dc8e06 100644
--- a/src/rw/TexturePools.h
+++ b/src/rw/TexturePools.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TEXTUREPOOLS_H__
+#define __GTA_TEXTUREPOOLS_H__
 
 class CTexturePool
 {
@@ -39,4 +40,6 @@ public:
 };
 
 void _TexturePoolsInitialise();
-void _TexturePoolsShutdown();
\ No newline at end of file
+void _TexturePoolsShutdown();
+
+#endif // __GTA_TEXTUREPOOLS_H__
diff --git a/src/rw/TxdStore.h b/src/rw/TxdStore.h
index 937fd1b7..603752c2 100644
--- a/src/rw/TxdStore.h
+++ b/src/rw/TxdStore.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TXDSTORE_H__
+#define __GTA_TXDSTORE_H__
 
 #include "templates.h"
 
@@ -42,3 +43,5 @@ public:
 	}
 	static bool isTxdLoaded(int slot);
 };
+
+#endif // __GTA_TXDSTORE_H__
diff --git a/src/rw/VisibilityPlugins.h b/src/rw/VisibilityPlugins.h
index 90afc0f5..4768ac2b 100644
--- a/src/rw/VisibilityPlugins.h
+++ b/src/rw/VisibilityPlugins.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_VISIBILITYPLUGINS_H__
+#define __GTA_VISIBILITYPLUGINS_H__
 
 #include "templates.h"
 
@@ -150,3 +151,5 @@ public:
 };
 
 RpMaterial *SetAlphaCB(RpMaterial *material, void *data);
+
+#endif // __GTA_VISIBILITYPLUGINS_H__
diff --git a/src/save/Date.cpp b/src/save/Date.cpp
index ca75bb5e..c448e794 100644
--- a/src/save/Date.cpp
+++ b/src/save/Date.cpp
@@ -88,4 +88,4 @@ CDate::PopulateDateFields(int8 &second, int8 &minute, int8 &hour, int8 &day, int
 	m_nDay = day;
 	m_nMonth = month;
 	m_nYear = year;
-}
\ No newline at end of file
+}
diff --git a/src/save/Date.h b/src/save/Date.h
index 15646c23..a08cf6f0 100644
--- a/src/save/Date.h
+++ b/src/save/Date.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DATE_H__
+#define __GTA_DATE_H__
 
 class CDate
 {
@@ -15,4 +16,6 @@ public:
 	bool operator<(const CDate &right);
 	bool operator==(const CDate &right);
 	void PopulateDateFields(int8 &second, int8 &minute, int8 &hour, int8 &day, int8 &month, int16 year);
-};
\ No newline at end of file
+};
+
+#endif // __GTA_DATE_H__
diff --git a/src/save/GenericGameStorage.h b/src/save/GenericGameStorage.h
index bebf426a..c6fb1ca2 100644
--- a/src/save/GenericGameStorage.h
+++ b/src/save/GenericGameStorage.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_GENERICGAMESTORAGE_H__
+#define __GTA_GENERICGAMESTORAGE_H__
 
 #include "Game.h"
 #include "PCSave.h"
@@ -64,3 +65,5 @@ enum {
 };
 
 #endif
+
+#endif // __GTA_GENERICGAMESTORAGE_H__
diff --git a/src/save/MemoryCard.h b/src/save/MemoryCard.h
index bae605ff..ee74a9ff 100644
--- a/src/save/MemoryCard.h
+++ b/src/save/MemoryCard.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MEMORYCARD_H__
+#define __GTA_MEMORYCARD_H__
 #include "common.h"
 #ifdef PS2_MENU
 #include "Date.h"
@@ -194,4 +195,6 @@ public:
 };
 
 extern CMemoryCard TheMemoryCard;
-#endif
\ No newline at end of file
+#endif
+
+#endif // __GTA_MEMORYCARD_H__
diff --git a/src/save/PCSave.h b/src/save/PCSave.h
index 2a29fa95..771821e4 100644
--- a/src/save/PCSave.h
+++ b/src/save/PCSave.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PCSAVE_H__
+#define __GTA_PCSAVE_H__
 
 enum eSaveStatus
 {
@@ -38,3 +39,5 @@ public:
 };
 
 extern C_PcSave PcSaveHelper;
+
+#endif // __GTA_PCSAVE_H__
diff --git a/src/save/SaveBuf.h b/src/save/SaveBuf.h
index d0817e9a..b90a82dc 100644
--- a/src/save/SaveBuf.h
+++ b/src/save/SaveBuf.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SAVEBUF_H__
+#define __GTA_SAVEBUF_H__
 
 #ifdef VALIDATE_SAVE_SIZE
 extern int32 _saveBufCount;
@@ -121,3 +122,5 @@ ZeroSaveBuf(uint8 *&buf, uint32 length)
 #define CheckSaveHeader(buf, a, b, c, d, size) SkipSaveBuf(buf, 8);
 #define CheckSaveHeaderWithLength(buf, len, a, b, c, d, size) SkipSaveBuf(buf, 8);
 #endif
+
+#endif // __GTA_SAVEBUF_H__
diff --git a/src/text/Messages.h b/src/text/Messages.h
index e8ba1bf7..dfaea5c9 100644
--- a/src/text/Messages.h
+++ b/src/text/Messages.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_MESSAGES_H__
+#define __GTA_MESSAGES_H__
 
 struct tMessage 
 {
@@ -67,3 +68,5 @@ public:
 	//static void CutString(int16, char*, char**);
 	//static void PrintString(char*, int16, int16, int16);
 };
+
+#endif // __GTA_MESSAGES_H__
diff --git a/src/text/Pager.cpp b/src/text/Pager.cpp
index 609c6860..84e5f8e3 100644
--- a/src/text/Pager.cpp
+++ b/src/text/Pager.cpp
@@ -181,4 +181,4 @@ CPager::RestartCurrentMessage()
 		m_messages[0].m_nCurrentPosition = -(m_nNumDisplayLetters + 10);
 		m_messages[0].m_nTimeToChangePosition = CTimer::GetTimeInMilliseconds() + m_messages[0].m_nSpeedMs;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/text/Pager.h b/src/text/Pager.h
index 16307971..dff0dc37 100644
--- a/src/text/Pager.h
+++ b/src/text/Pager.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PAGER_H__
+#define __GTA_PAGER_H__
 
 struct PagerMessage {
 	wchar *m_pText;
@@ -25,4 +26,6 @@ public:
 	void AddMessageWithNumber(wchar *str, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, uint16 speed, uint16 priority, uint16 a11);
 	void ClearMessages();
 	void RestartCurrentMessage();
-};
\ No newline at end of file
+};
+
+#endif // __GTA_PAGER_H__
diff --git a/src/text/Text.h b/src/text/Text.h
index 1174216c..469aebe1 100644
--- a/src/text/Text.h
+++ b/src/text/Text.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TEXT_H__
+#define __GTA_TEXT_H__
 
 char *UnicodeToAscii(wchar *src);
 char *UnicodeToAsciiForSaveLoad(wchar *src);
@@ -97,3 +98,5 @@ public:
 };
 
 extern CText TheText;
+
+#endif // __GTA_TEXT_H__
diff --git a/src/vehicles/Automobile.h b/src/vehicles/Automobile.h
index f4046e9e..c91bb270 100644
--- a/src/vehicles/Automobile.h
+++ b/src/vehicles/Automobile.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_AUTOMOBILE_H__
+#define __GTA_AUTOMOBILE_H__
 
 #include "Vehicle.h"
 #include "DamageManager.h"
@@ -172,4 +173,6 @@ public:
 };
 
 extern CVector vecHunterGunPos;
-extern bool bAllCarCheat;
\ No newline at end of file
+extern bool bAllCarCheat;
+
+#endif // __GTA_AUTOMOBILE_H__
diff --git a/src/vehicles/Bike.h b/src/vehicles/Bike.h
index 219d8872..1b738763 100644
--- a/src/vehicles/Bike.h
+++ b/src/vehicles/Bike.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_BIKE_H__
+#define __GTA_BIKE_H__
 
 #include "Vehicle.h"
 #include "Skidmarks.h"
@@ -169,4 +170,6 @@ inline int8 GetBikeDoorFlagInclJumpInFromFront(int32 carnode) {
 		default:
 			return CAR_DOOR_FLAG_UNKNOWN;
 	}
-}
\ No newline at end of file
+}
+
+#endif // __GTA_BIKE_H__
diff --git a/src/vehicles/Boat.h b/src/vehicles/Boat.h
index 5d866c48..11b04bd4 100644
--- a/src/vehicles/Boat.h
+++ b/src/vehicles/Boat.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_BOAT_H__
+#define __GTA_BOAT_H__
 
 #include "Vehicle.h"
 #include "Door.h"
@@ -82,4 +83,6 @@ public:
 #endif
 	static const uint32 nSaveStructSize;
 
-};
\ No newline at end of file
+};
+
+#endif // __GTA_BOAT_H__
diff --git a/src/vehicles/CarGen.h b/src/vehicles/CarGen.h
index fccbee96..f6d487fd 100644
--- a/src/vehicles/CarGen.h
+++ b/src/vehicles/CarGen.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CARGEN_H__
+#define __GTA_CARGEN_H__
 #include "common.h"
 #include "config.h"
 
@@ -49,3 +50,5 @@ public:
 	static void SaveAllCarGenerators(uint8 *, uint32 *);
 	static void LoadAllCarGenerators(uint8 *, uint32);
 };
+
+#endif // __GTA_CARGEN_H__
diff --git a/src/vehicles/Cranes.h b/src/vehicles/Cranes.h
index e842ed3f..2053d915 100644
--- a/src/vehicles/Cranes.h
+++ b/src/vehicles/Cranes.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_CRANES_H__
+#define __GTA_CRANES_H__
 #include "common.h"
 
 #include "World.h"
@@ -94,3 +95,5 @@ public:
 	static int32 NumCranes;
 	static CCrane aCranes[NUM_CRANES];
 };
+
+#endif // __GTA_CRANES_H__
diff --git a/src/vehicles/DamageManager.h b/src/vehicles/DamageManager.h
index 312006e3..f595818e 100644
--- a/src/vehicles/DamageManager.h
+++ b/src/vehicles/DamageManager.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DAMAGEMANAGER_H__
+#define __GTA_DAMAGEMANAGER_H__
 
 #include "common.h"
 
@@ -113,3 +114,5 @@ public:
 	bool ProgressEngineDamage(void);
 };
 VALIDATE_SIZE(CDamageManager, 0x1C);
+
+#endif // __GTA_DAMAGEMANAGER_H__
diff --git a/src/vehicles/Door.h b/src/vehicles/Door.h
index 567d3263..1f7a2e8b 100644
--- a/src/vehicles/Door.h
+++ b/src/vehicles/Door.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_DOOR_H__
+#define __GTA_DOOR_H__
 
 class CVehicle;
 
@@ -67,3 +68,5 @@ public:
 	float RetTranslationWhenOpen(void);
 	void Open(float ratio);
 };
+
+#endif // __GTA_DOOR_H__
diff --git a/src/vehicles/Floater.h b/src/vehicles/Floater.h
index 91ab70ae..f51a1abf 100644
--- a/src/vehicles/Floater.h
+++ b/src/vehicles/Floater.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_FLOATER_H__
+#define __GTA_FLOATER_H__
 
 class CPhysical;
 
@@ -45,3 +46,5 @@ public:
 	bool CalcBuoyancyForce(CPhysical *phys, CVector *impulse, CVector *point);
 };
 extern cBuoyancy mod_Buoyancy;
+
+#endif // __GTA_FLOATER_H__
diff --git a/src/vehicles/HandlingMgr.h b/src/vehicles/HandlingMgr.h
index 8d290f7d..d496af25 100644
--- a/src/vehicles/HandlingMgr.h
+++ b/src/vehicles/HandlingMgr.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_HANDLINGMGR_H__
+#define __GTA_HANDLINGMGR_H__
 
 #include "Transmission.h"
 
@@ -277,3 +278,5 @@ public:
 	bool HasFrontWheelDrive(tVehicleType id) { return HandlingData[id].Transmission.nDriveType != 'R'; }
 };
 extern cHandlingDataMgr mod_HandlingManager;
+
+#endif // __GTA_HANDLINGMGR_H__
diff --git a/src/vehicles/Heli.h b/src/vehicles/Heli.h
index c5ae08e2..38a3edab 100644
--- a/src/vehicles/Heli.h
+++ b/src/vehicles/Heli.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_HELI_H__
+#define __GTA_HELI_H__
 
 #include "Vehicle.h"
 
@@ -99,3 +100,5 @@ public:
 
 	static void ActivateHeli(bool activate);
 };
+
+#endif // __GTA_HELI_H__
diff --git a/src/vehicles/Plane.h b/src/vehicles/Plane.h
index c8f02048..e3598b45 100644
--- a/src/vehicles/Plane.h
+++ b/src/vehicles/Plane.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PLANE_H__
+#define __GTA_PLANE_H__
 
 #include "Vehicle.h"
 
@@ -79,3 +80,5 @@ public:
 extern float LandingPoint;
 extern float TakeOffPoint;
 extern float PlanePathPosition[3];
+
+#endif // __GTA_PLANE_H__
diff --git a/src/vehicles/Train.h b/src/vehicles/Train.h
index 57cd28de..9f372a9f 100644
--- a/src/vehicles/Train.h
+++ b/src/vehicles/Train.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TRAIN_H__
+#define __GTA_TRAIN_H__
 
 #include "Vehicle.h"
 #include "Door.h"
@@ -82,3 +83,5 @@ public:
 		float *totalLength, float *totalDuration, CTrainInterpolationLine *interpLines, bool rightRail);
 	static void UpdateTrains(void);
 };
+
+#endif // __GTA_TRAIN_H__
diff --git a/src/vehicles/Transmission.h b/src/vehicles/Transmission.h
index a3d15513..3fa4993c 100644
--- a/src/vehicles/Transmission.h
+++ b/src/vehicles/Transmission.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_TRANSMISSION_H__
+#define __GTA_TRANSMISSION_H__
 
 struct tGear
 {
@@ -26,3 +27,5 @@ public:
 	void CalculateGearForSimpleCar(float speed, uint8 &gear);
 	float CalculateDriveAcceleration(const float &gasPedal, uint8 &gear, float &time, const float &velocity, bool cheat);
 };
+
+#endif // __GTA_TRANSMISSION_H__
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index f83e1bb0..d21f8bf4 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_VEHICLE_H__
+#define __GTA_VEHICLE_H__
 
 #include "Physical.h"
 #include "AutoPilot.h"
@@ -449,3 +450,5 @@ inline int8 GetEnterCarDoorFlag(int32 carnode, uint8 numMaxPassengers) {
 		return CAR_DOOR_FLAG_UNKNOWN;
 	}
 }
+
+#endif // __GTA_VEHICLE_H__
diff --git a/src/weapons/BulletInfo.h b/src/weapons/BulletInfo.h
index cf1dd27f..b71d9ddc 100644
--- a/src/weapons/BulletInfo.h
+++ b/src/weapons/BulletInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_BULLETINFO_H__
+#define __GTA_BULLETINFO_H__
 
 #include "WeaponType.h"
 
@@ -22,4 +23,6 @@ public:
 	static bool AddBullet(CEntity* pSource, eWeaponType type, CVector vecPosition, CVector vecSpeed);
 	static void Update(void);
 	static bool TestForSniperBullet(float x1, float x2, float y1, float y2, float z1, float z2);
-};
\ No newline at end of file
+};
+
+#endif // __GTA_BULLETINFO_H__
diff --git a/src/weapons/Explosion.cpp b/src/weapons/Explosion.cpp
index 7683ed97..b8123c96 100644
--- a/src/weapons/Explosion.cpp
+++ b/src/weapons/Explosion.cpp
@@ -511,4 +511,4 @@ CExplosion::RemoveAllExplosionsInArea(CVector pos, float radius)
 				gaExplosion[i].m_nIteration = 0;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/weapons/Explosion.h b/src/weapons/Explosion.h
index e76c99ea..487cbe88 100644
--- a/src/weapons/Explosion.h
+++ b/src/weapons/Explosion.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_EXPLOSION_H__
+#define __GTA_EXPLOSION_H__
 
 class CEntity;
 class CVector;
@@ -55,4 +56,6 @@ public:
 	static bool TestForExplosionInArea(eExplosionType type, float x1, float x2, float y1, float y2, float z1, float z2); //done, not used
 };
 
-extern CExplosion gaExplosion[NUM_EXPLOSIONS];
\ No newline at end of file
+extern CExplosion gaExplosion[NUM_EXPLOSIONS];
+
+#endif // __GTA_EXPLOSION_H__
diff --git a/src/weapons/ProjectileInfo.h b/src/weapons/ProjectileInfo.h
index d1688948..c74f8be9 100644
--- a/src/weapons/ProjectileInfo.h
+++ b/src/weapons/ProjectileInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_PROJECTILEINFO_H__
+#define __GTA_PROJECTILEINFO_H__
 
 #include "WeaponType.h"
 
@@ -31,4 +32,6 @@ public:
 	static bool IsProjectileInRange(float x1, float x2, float y1, float y2, float z1, float z2, bool remove);
 };
 
-extern CProjectileInfo gaProjectileInfo[NUM_PROJECTILES];
\ No newline at end of file
+extern CProjectileInfo gaProjectileInfo[NUM_PROJECTILES];
+
+#endif // __GTA_PROJECTILEINFO_H__
diff --git a/src/weapons/ShotInfo.h b/src/weapons/ShotInfo.h
index db6158c2..22386378 100644
--- a/src/weapons/ShotInfo.h
+++ b/src/weapons/ShotInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_SHOTINFO_H__
+#define __GTA_SHOTINFO_H__
 
 #include "WeaponType.h"
 
@@ -22,3 +23,5 @@ public:
 	static void Shutdown(void);
 	static void Update(void);
 };
+
+#endif // __GTA_SHOTINFO_H__
diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h
index f720b312..fba9f1c8 100644
--- a/src/weapons/Weapon.h
+++ b/src/weapons/Weapon.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_WEAPON_H__
+#define __GTA_WEAPON_H__
 
 #include "WeaponType.h"
 
@@ -87,4 +88,6 @@ public:
 };
 VALIDATE_SIZE(CWeapon, 0x18);
 
-void FireOneInstantHitRound(CVector *source, CVector *target, int32 damage);
\ No newline at end of file
+void FireOneInstantHitRound(CVector *source, CVector *target, int32 damage);
+
+#endif // __GTA_WEAPON_H__
diff --git a/src/weapons/WeaponEffects.cpp b/src/weapons/WeaponEffects.cpp
index bb95ea85..f88713f1 100644
--- a/src/weapons/WeaponEffects.cpp
+++ b/src/weapons/WeaponEffects.cpp
@@ -130,4 +130,4 @@ CWeaponEffects::Render(void)
 		RwRenderStateSet(rwRENDERSTATEZWRITEENABLE,      (void *)TRUE);
 		RwRenderStateSet(rwRENDERSTATEZTESTENABLE,       (void *)TRUE);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/weapons/WeaponEffects.h b/src/weapons/WeaponEffects.h
index f6592b3e..9befd527 100644
--- a/src/weapons/WeaponEffects.h
+++ b/src/weapons/WeaponEffects.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_WEAPONEFFECTS_H__
+#define __GTA_WEAPONEFFECTS_H__
 
 class CWeaponEffects
 {
@@ -23,4 +24,6 @@ public:
 	static void Render(void);
 };
 
-VALIDATE_SIZE(CWeaponEffects, 0x1C);
\ No newline at end of file
+VALIDATE_SIZE(CWeaponEffects, 0x1C);
+
+#endif // __GTA_WEAPONEFFECTS_H__
diff --git a/src/weapons/WeaponInfo.h b/src/weapons/WeaponInfo.h
index d7f1563d..f98e890e 100644
--- a/src/weapons/WeaponInfo.h
+++ b/src/weapons/WeaponInfo.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_WEAPONINFO_H__
+#define __GTA_WEAPONINFO_H__
 
 #include "AnimManager.h"
 #include "AnimationId.h"
@@ -72,3 +73,5 @@ public:
 };
 
 VALIDATE_SIZE(CWeaponInfo, 0x64);
+
+#endif // __GTA_WEAPONINFO_H__
diff --git a/src/weapons/WeaponType.h b/src/weapons/WeaponType.h
index 1220196f..c68c520f 100644
--- a/src/weapons/WeaponType.h
+++ b/src/weapons/WeaponType.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTA_WEAPONTYPE_H__
+#define __GTA_WEAPONTYPE_H__
 
 enum eWeaponType
 {
@@ -83,4 +84,6 @@ enum eWeaponState
 	WEAPONSTATE_RELOADING,
 	WEAPONSTATE_OUT_OF_AMMO,
 	WEAPONSTATE_MELEE_MADECONTACT
-};
\ No newline at end of file
+};
+
+#endif // __GTA_WEAPONTYPE_H__