#pragma once -> include guards, add empty lines at end; thanks ee-gcc

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__

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__

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__

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);
+VALIDATE_SIZE(CAnimBlendHierarchy, 0x28);
+
+#endif // __GTA_ANIMBLENDHIERARCHY_H__

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__

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__

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__

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__

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,
-};
+};
+
+#endif // __GTA_ANIMATIONID_H__

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__

src/animation/CutsceneMgr.cpp

@@ -680,4 +680,4 @@ CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver()
 
 	pPlayerPed->ClearWeapons();
 	CGame::DrasticTidyUpMemory(true);
-}
+}

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__

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__

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__

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__

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__

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);
+extern void PlayOneShotScriptObject(uint8 id, CVector const &pos);
+
+#endif // __GTA_AUDIOSCRIPTOBJECT_H__

src/audio/DMAudio.cpp

@@ -405,4 +405,4 @@ void
 cDMAudio::ShutUpPlayerTalking(bool8 state)
 {
 	AudioManager.m_bIsPlayerShutUp = state;
-}
+}

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__

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__

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__

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__

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
+#endif
+
+#endif // __GTA_CHANNEL_H__

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
+#endif

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__

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__

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",
-};
+};
+
+#endif // __GTA_SAMPMAN_H__

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__

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__

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;
 	}
-};
+};
+
+#endif // __GTA_SOLID_H__

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__

src/collision/ColBox.cpp

@@ -18,4 +18,4 @@ CColBox::operator=(const CColBox& other)
 	surface = other.surface;
 	piece = other.piece;
 	return *this;
-}
+}

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);
-};
+};
+
+#endif // __GTA_COLBOX_H__

src/collision/ColLine.cpp

@@ -6,4 +6,4 @@ CColLine::Set(const CVector &p0, const CVector &p1)
 {
 	this->p0 = p0;
 	this->p1 = p1;
-}
+}

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);
-};
+};
+
+#endif // __GTA_COLLINE_H__

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);
-};
+};
+
+#endif // __GTA_COLMODEL_H__

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__

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;
-}
+}

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;
-};
+};
+
+#endif // __GTA_COLSPHERE_H__

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__

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
+#endif

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
-};
+};
+
+#endif // __GTA_COLTRIANGLE_H__

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__

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
-};
+};
+
+#endif // __GTA_COMPRESSEDVECTOR_H__

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__

src/collision/VuCollision.cpp

@@ -279,4 +279,4 @@ SphereToTriangleCollisionCompressed(const CVuVector &sph, VuTriangle &tri)
 	SphereToTriangleCollision(sph, v0, v1, v2, plane);
 #endif
 }
-#endif
+#endif

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__

src/control/AutoPilot.cpp

@@ -133,4 +133,4 @@ void CAutoPilot::Load(uint8*& buf)
 	ReadSaveBuf(&m_nPathFindNodesCount, buf);
 	SkipSaveBuf(buf, 6);
 }
-#endif
+#endif

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__

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__

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__

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];
+extern CVehicle* apCarsToKeep[MAX_CARS_TO_KEEP];
+
+#endif // __GTA_CARCTRL_H__

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);
-}
+}

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__

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__

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;
-};
+};
+
+#endif // __GTA_GAMELOGIC_H__

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__

src/control/NameGrid.cpp

@@ -84,4 +84,4 @@ CGrid::Process()
 	ProcessControllerInput();
 	DisplayGrid();
 	playerName.DisplayName(2 * playerName.unk_4c);
-}
+}

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();
-};
+};
+
+#endif // __GTA_NAMEGRID_H__

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__

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__

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);
+void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg);
+
+#endif // __GTA_PHONES_H__

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
-}
+}

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__

src/control/PowerPoints.cpp

@@ -19,4 +19,4 @@ void CPowerPoints::Save(uint8**, uint32*)
 {}
 
 void CPowerPoints::Load(uint8*, uint32)
-{}
+{}

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);
-};
+};
+
+#endif // __GTA_POWERPOINTS_H__

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__

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__

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__

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__

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__

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__

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__

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
+#endif
+
+#endif // __GTA_SCRIPTCOMMANDS_H__

src/control/SetPieces.cpp

@@ -322,4 +322,4 @@ CCopPed* CSetPiece::TryToGenerateCopPed(CVector2D vSpawn)
 	}
 	CWorld::Add(pCop);
 	return pCop;
-}
+}

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__

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__

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;
+extern CAccidentManager gAccidentManager;
+
+#endif // __GTA_ACCIDENT_H__

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();
-};
+};
+
+#endif // __GTA_ANIMVIEWER_H__

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__

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__

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__

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;
+extern CControllerConfigManager ControlsManager;
+
+#endif // __GTA_CONTROLLERCONFIG_H__

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__

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__

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__

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];
+extern CEvent gaEvent[NUMEVENTS];
+
+#endif // __GTA_EVENTLIST_H__

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__

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__

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__

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);
-};
+};
+
+#endif // __GTA_FRONTENDCONTROLS_H__

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__

src/core/FrontendTriggers.h

@@ -1390,4 +1390,4 @@ TriggerDisplay_Trails(CMenuOnOffTriggered *widget)
 	}
 }
 
-#endif
+#endif

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;
+extern CMenuManager FrontEndMenuManager;
+
+#endif // __GTA_FRONTEND_PS2_H__

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__

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__

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;
-}
+}

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__

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__

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__