diff --git a/Aquaria/AquariaMenuItem.h b/Aquaria/AquariaMenuItem.h
index c9c4ad5..161142f 100644
--- a/Aquaria/AquariaMenuItem.h
+++ b/Aquaria/AquariaMenuItem.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef AQUARIAMENUITEM_H
+#define AQUARIAMENUITEM_H
 
 #include "../BBGE/BitmapFont.h"
 #include "../BBGE/Quad.h"
@@ -257,3 +258,4 @@ protected:
 };
 */
 
+#endif
diff --git a/Aquaria/AquariaProgressBar.h b/Aquaria/AquariaProgressBar.h
index 6635c11..be0a5ad 100644
--- a/Aquaria/AquariaProgressBar.h
+++ b/Aquaria/AquariaProgressBar.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef AQUARIAPROGRESSBAR_H
+#define AQUARIAPROGRESSBAR_H
 
 #include "../BBGE/Quad.h"
 
@@ -34,3 +35,4 @@ protected:
 	float perc;
 };
 
+#endif
diff --git a/Aquaria/AutoMap.h b/Aquaria/AutoMap.h
index 29c154c..365c621 100644
--- a/Aquaria/AutoMap.h
+++ b/Aquaria/AutoMap.h
@@ -18,7 +18,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef AUTOMAP_H
+#define AUTOMAP_H
+
 #include "../BBGE/ActionMapper.h"
 #include "../BBGE/RenderObject.h"
 
@@ -47,3 +49,4 @@ protected:
 	void onRender();
 };
 
+#endif
diff --git a/Aquaria/Avatar.h b/Aquaria/Avatar.h
index fbd1448..b4232f5 100644
--- a/Aquaria/Avatar.h
+++ b/Aquaria/Avatar.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef AVATAR_H
+#define AVATAR_H
 
 #include "../BBGE/Particles.h"
 #include "../BBGE/BitmapFont.h"
@@ -544,6 +545,4 @@ protected:
 
 };
 
-
-
-
+#endif
diff --git a/Aquaria/CollideEntity.h b/Aquaria/CollideEntity.h
index b2d7997..0100aae 100644
--- a/Aquaria/CollideEntity.h
+++ b/Aquaria/CollideEntity.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef COLLIDEENTITY_H
+#define COLLIDEENTITY_H
 
 #include "Entity.h"
 
@@ -41,3 +42,5 @@ protected:
 	void bounce(float ba);
 	
 };
+
+#endif
diff --git a/Aquaria/Entity.h b/Aquaria/Entity.h
index 3f468f9..cc4d125 100644
--- a/Aquaria/Entity.h
+++ b/Aquaria/Entity.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef ENTITY_H
+#define ENTITY_H
 
 #include "../BBGE/AnimatedSprite.h"
 #include "../BBGE/StateMachine.h"
@@ -606,3 +607,4 @@ private:
 
 };
 
+#endif
diff --git a/Aquaria/FlockEntity.h b/Aquaria/FlockEntity.h
index e60dfb9..aa68f69 100644
--- a/Aquaria/FlockEntity.h
+++ b/Aquaria/FlockEntity.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef FLOCKENTITY_H
+#define FLOCKENTITY_H
 
 #include "CollideEntity.h"
 
@@ -67,3 +68,5 @@ protected:
 	FlockEntity *nearestFlockMate;
 	float nearestDistance;
 };
+
+#endif
diff --git a/Aquaria/Game.h b/Aquaria/Game.h
index 29ee6b1..c7789ee 100644
--- a/Aquaria/Game.h
+++ b/Aquaria/Game.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef GAME_H
+#define GAME_H
 
 #include "../ExternalLibs/tinyxml.h"
 #include "../BBGE/DebugFont.h"
@@ -1249,3 +1250,5 @@ bool Game::isObstructed(const TileVector &tile, int t /* = -1 */) const
 {
 	return (getGrid(tile) & t);
 }
+
+#endif
diff --git a/Aquaria/GridRender.h b/Aquaria/GridRender.h
index 4fed0e1..52a2c2d 100644
--- a/Aquaria/GridRender.h
+++ b/Aquaria/GridRender.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef GRIDRENDER_H
+#define GRIDRENDER_H
 
 #include "../BBGE/Quad.h"
 
@@ -150,3 +151,4 @@ protected:
 	std::vector<SongLinePoint> pts;
 };
 
+#endif
diff --git a/Aquaria/Path.h b/Aquaria/Path.h
index d863d89..b3369a2 100644
--- a/Aquaria/Path.h
+++ b/Aquaria/Path.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef AQ_PATH_H
+#define AQ_PATH_H
 
 #include "../BBGE/Base.h"
 #include "../BBGE/Particles.h"
@@ -149,3 +150,4 @@ public:
 	void parseWarpNodeData(const std::string &dataString);
 };
 
+#endif
diff --git a/Aquaria/PathFinding.h b/Aquaria/PathFinding.h
index b44246f..fb82b42 100644
--- a/Aquaria/PathFinding.h
+++ b/Aquaria/PathFinding.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef PATHFINDING_H
+#define PATHFINDING_H
 
 #include "../BBGE/Base.h"
 //#include "Astar.h"
@@ -803,7 +804,7 @@ private: // data
 
 };
 
-
+#endif
 
 
 
diff --git a/Aquaria/SchoolFish.h b/Aquaria/SchoolFish.h
index 3512a54..53208c7 100644
--- a/Aquaria/SchoolFish.h
+++ b/Aquaria/SchoolFish.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef SCHOOLFISH_H
+#define SCHOOLFISH_H
 
 #include "FlockEntity.h"
 
@@ -50,3 +51,4 @@ protected:
 	
 };
 
+#endif
diff --git a/Aquaria/ScriptInterface.h b/Aquaria/ScriptInterface.h
index 9fdb0f8..bf23dca 100644
--- a/Aquaria/ScriptInterface.h
+++ b/Aquaria/ScriptInterface.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef SCRIPTINTERFACE_H
+#define SCRIPTINTERFACE_H
 
 #include "../BBGE/Base.h"
 
@@ -101,3 +102,5 @@ protected:
 
 	lua_State *baseState;
 };
+
+#endif
diff --git a/Aquaria/ScriptedEntity.h b/Aquaria/ScriptedEntity.h
index ea67712..a838728 100644
--- a/Aquaria/ScriptedEntity.h
+++ b/Aquaria/ScriptedEntity.h
@@ -18,7 +18,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef SCRIPTEDENTITY_H
+#define SCRIPTEDENTITY_H
+
 #include "CollideEntity.h"
 #include "Segmented.h"
 #include "Hair.h"
@@ -112,3 +114,5 @@ protected:
 	void onExitState(int action);
 	virtual void deathNotify(RenderObject *r);
 };
+
+#endif
diff --git a/Aquaria/Segmented.h b/Aquaria/Segmented.h
index b1fea06..c9fb81d 100644
--- a/Aquaria/Segmented.h
+++ b/Aquaria/Segmented.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef SEGMENTED_H
+#define SEGMENTED_H
 
 #include "../BBGE/Quad.h"
 
@@ -53,3 +54,4 @@ protected:
 	void onRender();
 };
 
+#endif
diff --git a/Aquaria/Shot.h b/Aquaria/Shot.h
index 9ead4a1..c94d911 100644
--- a/Aquaria/Shot.h
+++ b/Aquaria/Shot.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef SHOT_H
+#define SHOT_H
 
 #include "CollideEntity.h"
 #include "Segmented.h"
@@ -192,3 +193,4 @@ protected:
 	void onEndOfLife();
 };
 
+#endif
diff --git a/Aquaria/StatsAndAchievements.h b/Aquaria/StatsAndAchievements.h
index 3fc0b7c..5087d11 100644
--- a/Aquaria/StatsAndAchievements.h
+++ b/Aquaria/StatsAndAchievements.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef STATS_ACH_H
+#define STATS_ACH_H
 
 #ifdef BBGE_BUILD_ACHIEVEMENTS_INTERNAL
 #include <queue>
@@ -172,4 +173,4 @@ private:
 	*/
 };
 
-
+#endif
diff --git a/Aquaria/TileVector.h b/Aquaria/TileVector.h
index b3620f0..cc25959 100644
--- a/Aquaria/TileVector.h
+++ b/Aquaria/TileVector.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef TILEVECTOR_H
+#define TILEVECTOR_H
 
 #include "../BBGE/Vector.h"
 
@@ -55,3 +56,4 @@ public:
 	int x,y;
 };
 
+#endif
diff --git a/Aquaria/ToolTip.h b/Aquaria/ToolTip.h
index e822c90..73095ed 100644
--- a/Aquaria/ToolTip.h
+++ b/Aquaria/ToolTip.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef TOOLTIP_H
+#define TOOLTIP_H
 
 #include "../BBGE/BitmapFont.h"
 #include "../BBGE/Quad.h"
@@ -51,4 +52,4 @@ protected:
 	Quad *back;
 };
 
-
+#endif
diff --git a/Aquaria/UserSettings.h b/Aquaria/UserSettings.h
index e152033..50b6c3f 100644
--- a/Aquaria/UserSettings.h
+++ b/Aquaria/UserSettings.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef USERSETTINGS_H
+#define USERSETTINGS_H
 
 #include <string>
 
@@ -182,3 +183,5 @@ public:
 	void save();
 	void apply();
 };
+
+#endif
diff --git a/Aquaria/WaterFont.h b/Aquaria/WaterFont.h
index 809063f..955603e 100644
--- a/Aquaria/WaterFont.h
+++ b/Aquaria/WaterFont.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef WATERFONT_H
+#define WATERFONT_H
 
 #include "../BBGE/BitmapFont.h"
 
@@ -31,3 +32,4 @@ protected:
 	void onUpdate(float dt);
 };
 
+#endif
diff --git a/Aquaria/WaterSurfaceRender.h b/Aquaria/WaterSurfaceRender.h
index ba4878d..e01f7fc 100644
--- a/Aquaria/WaterSurfaceRender.h
+++ b/Aquaria/WaterSurfaceRender.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef WATERSURFACERENDER_H
+#define WATERSURFACERENDER_H
 
 #include "../BBGE/Quad.h"
 
@@ -32,4 +33,4 @@ protected:
 	void onRender();
 };
 
-
+#endif
diff --git a/Aquaria/Web.h b/Aquaria/Web.h
index 7f4e9bc..78762d0 100644
--- a/Aquaria/Web.h
+++ b/Aquaria/Web.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef AQ_WEB_H
+#define AQ_WEB_H
 
 #include "../BBGE/Quad.h"
 #include "Entity.h"
@@ -44,3 +45,4 @@ protected:
 	void onRender();
 };
 
+#endif
diff --git a/BBGE/ActionInput.h b/BBGE/ActionInput.h
index d45a9d1..a679204 100644
--- a/BBGE/ActionInput.h
+++ b/BBGE/ActionInput.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef ACTIONINPUT_H
+#define ACTIONINPUT_H
 
 #include <string>
 #include <vector>
@@ -53,3 +54,5 @@ enum InputSetType
 	INPUTSET_MOUSE		= 3,
 	INPUTSET_OTHER		= 4
 };
+
+#endif
diff --git a/BBGE/ActionSet.h b/BBGE/ActionSet.h
index 282ee03..3d9b9a4 100644
--- a/BBGE/ActionSet.h
+++ b/BBGE/ActionSet.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef ACTIONSET_H
+#define ACTIONSET_H
 
 #include <string>
 #include <vector>
@@ -47,3 +48,5 @@ public:
 	
 	std::string insertInputIntoString(const std::string &string);
 };
+
+#endif
diff --git a/BBGE/Base.h b/BBGE/Base.h
index 345065c..586a944 100644
--- a/BBGE/Base.h
+++ b/BBGE/Base.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef BBGE_BASE_H
+#define BBGE_BASE_H
 
 #ifdef BBGE_BUILD_WINDOWS
 
@@ -296,3 +297,5 @@ void openURL(const std::string &url);
 
 std::string underscoresToSpaces(const std::string &str);
 std::string spacesToUnderscores(const std::string &str);
+
+#endif
diff --git a/BBGE/BitmapFont.h b/BBGE/BitmapFont.h
index a8264ff..0ddfe79 100644
--- a/BBGE/BitmapFont.h
+++ b/BBGE/BitmapFont.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef BITMAPFONT_H
+#define BITMAPFONT_H
 
 //#include "DrawText.h"
 #include "RenderObject.h"
@@ -101,3 +102,4 @@ protected:
 	int textWidth;
 };
 
+#endif
diff --git a/BBGE/BloomEffect.h b/BBGE/BloomEffect.h
index 43d2208..19503b2 100644
--- a/BBGE/BloomEffect.h
+++ b/BBGE/BloomEffect.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef BLOOMEFFECT_H
+#define BLOOMEFFECT_H
 
 #include "RenderObject.h"
 #include "FrameBuffer.h"
@@ -44,3 +45,4 @@ protected:
 	bool useFrameBuffer;
 };
 
+#endif
diff --git a/BBGE/Collision.h b/BBGE/Collision.h
index 09df967..2d06fa4 100644
--- a/BBGE/Collision.h
+++ b/BBGE/Collision.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef COLLISION_H
+#define COLLISION_H
 
 #include "Base.h"
 
@@ -142,3 +143,4 @@ public:
 };
 */
 
+#endif
diff --git a/BBGE/CommonEvents.h b/BBGE/CommonEvents.h
index 6d8703f..e435ab8 100644
--- a/BBGE/CommonEvents.h
+++ b/BBGE/CommonEvents.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef COMMONEVENTS_H
+#define COMMONEVENTS_H
 
 #include "Event.h"
 
@@ -46,3 +47,5 @@ public:
 private:
 	std::string state;
 };
+
+#endif
diff --git a/BBGE/DarkLayer.h b/BBGE/DarkLayer.h
index 3d37d52..a571ea7 100644
--- a/BBGE/DarkLayer.h
+++ b/BBGE/DarkLayer.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef DARKLAYER_H
+#define DARKLAYER_H
 
 #include "Base.h"
 #include "FrameBuffer.h"
@@ -52,3 +53,4 @@ protected:
 	GLuint format;
 };
 
+#endif
diff --git a/BBGE/DebugFont.h b/BBGE/DebugFont.h
index 00ec72a..d11c17f 100644
--- a/BBGE/DebugFont.h
+++ b/BBGE/DebugFont.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef DEBUGFONT_H
+#define DEBUGFONT_H
 
 #include "Core.h"
 #include "BaseText.h"
@@ -66,3 +67,4 @@ public:
 	virtual void buttonPress(DebugButton *db){}
 };
 
+#endif
diff --git a/BBGE/Effects.h b/BBGE/Effects.h
index 418427f..debf7d0 100644
--- a/BBGE/Effects.h
+++ b/BBGE/Effects.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef EFFECTS_H
+#define EFFECTS_H
 
 #include "Vector.h"
 #include "Base.h"
@@ -57,4 +58,5 @@ protected:
 	bool enabled[FXT_MAX];
 };
 
+#endif
 
diff --git a/BBGE/FileVars.h b/BBGE/FileVars.h
index 24c90d3..166181d 100644
--- a/BBGE/FileVars.h
+++ b/BBGE/FileVars.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef FILEVARS_H
+#define FILEVARS_H
 
 #include "Base.h"
 
@@ -34,3 +35,5 @@ protected:
 	std::map<std::string,float> floats;
 	std::map<std::string, int> ints;
 };
+
+#endif
diff --git a/BBGE/Flags.h b/BBGE/Flags.h
index da0142f..5eb304b 100644
--- a/BBGE/Flags.h
+++ b/BBGE/Flags.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef BBGE_FLAGS_H
+#define BBGE_FLAGS_H
 
 #ifdef BBGE_BUILD_WINDOWS
 	typedef unsigned __int32	uint32;
@@ -44,3 +45,4 @@ public:
 	uint32 flags;
 };
 
+#endif
diff --git a/BBGE/FrameBuffer.h b/BBGE/FrameBuffer.h
index 67636d7..105b290 100644
--- a/BBGE/FrameBuffer.h
+++ b/BBGE/FrameBuffer.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef FRAMEBUFFER_H
+#define FRAMEBUFFER_H
 
 #include "Base.h"
 
@@ -57,3 +58,4 @@ protected:
 	bool enabled, inited;
 };
 
+#endif
diff --git a/BBGE/Gradient.h b/BBGE/Gradient.h
index f145e2c..8d92d5d 100644
--- a/BBGE/Gradient.h
+++ b/BBGE/Gradient.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef GRADIENT_H
+#define GRADIENT_H
 
 #include "RenderObject.h"
 
@@ -37,3 +38,5 @@ protected:
 	void onRender();
 	Vector ulc0, ulc1, ulc2, ulc3;
 };
+
+#endif
diff --git a/BBGE/LensFlare.h b/BBGE/LensFlare.h
index 5f75718..ed88bd3 100644
--- a/BBGE/LensFlare.h
+++ b/BBGE/LensFlare.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef LENSFLARE_H
+#define LENSFLARE_H
 
 #include "Quad.h"
 
@@ -34,3 +35,5 @@ protected:
 	void onUpdate(float dt);
 	std::vector <Quad*> flares;
 };
+
+#endif
diff --git a/BBGE/Model.h b/BBGE/Model.h
index e732210..3b78728 100644
--- a/BBGE/Model.h
+++ b/BBGE/Model.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef BBGE_MODEL_H
+#define BBGE_MODEL_H
 
 #include "RenderObject.h"
 
@@ -57,3 +58,5 @@ protected:
 	float m_lodLevel;
 	std::string m_path;
 };
+
+#endif
diff --git a/BBGE/PointSprites.h b/BBGE/PointSprites.h
index c5cf695..d80ec3b 100644
--- a/BBGE/PointSprites.h
+++ b/BBGE/PointSprites.h
@@ -18,7 +18,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef POINTSPRITES_H
+#define POINTSPRITES_H
+
 #include "Base.h"
 
 #ifdef BBGE_BUILD_WINDOWS
@@ -34,3 +36,4 @@ public:
 };
 
 #endif
+#endif
diff --git a/BBGE/Precacher.h b/BBGE/Precacher.h
index 92f032c..87e9a05 100644
--- a/BBGE/Precacher.h
+++ b/BBGE/Precacher.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef PRECACHER_H
+#define PRECACHER_H
 
 #include "Quad.h"
 
@@ -37,3 +38,5 @@ private:
 	bool cleaned;
 	void (*loadProgressCallback)();
 };
+
+#endif
diff --git a/BBGE/QuadTrail.h b/BBGE/QuadTrail.h
index 5051e47..9f21c6b 100644
--- a/BBGE/QuadTrail.h
+++ b/BBGE/QuadTrail.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef QUADTRAIL_H
+#define QUADTRAIL_H
 
 #include "RenderObject.h"
 
@@ -60,3 +61,5 @@ protected:
 	void onRender();
 	void onUpdate(float dt);
 };
+
+#endif
diff --git a/BBGE/Rect.h b/BBGE/Rect.h
index efd1f58..8b3b67b 100644
--- a/BBGE/Rect.h
+++ b/BBGE/Rect.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef BBGE_RECT_H
+#define BBGE_RECT_H
 
 #include "Vector.h"
 
@@ -70,3 +71,5 @@ public:
 	}
 	int x1, y1, x2, y2;
 };
+
+#endif
diff --git a/BBGE/RenderObject_inline.h b/BBGE/RenderObject_inline.h
index f4b6916..2e7af29 100644
--- a/BBGE/RenderObject_inline.h
+++ b/BBGE/RenderObject_inline.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef RENDEROBJECT_INLINE_H
+#define RENDEROBJECT_INLINE_H
 
 inline bool RenderObject::isOnScreen()
 {
@@ -70,3 +71,5 @@ Vector RenderObject::getFollowCameraPosition() const
 		return pos;
 	}
 }
+
+#endif
diff --git a/BBGE/RoundedRect.h b/BBGE/RoundedRect.h
index c494a6c..5a4309b 100644
--- a/BBGE/RoundedRect.h
+++ b/BBGE/RoundedRect.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef ROUNDEDRECT_H
+#define ROUNDEDRECT_H
 
 #include "RenderObject.h"
 #include "Event.h"
@@ -67,3 +68,5 @@ protected:
 	bool mbd;
 	bool noNested;
 };
+
+#endif
diff --git a/BBGE/ScreenTransition.h b/BBGE/ScreenTransition.h
index 23e3087..c4adc14 100644
--- a/BBGE/ScreenTransition.h
+++ b/BBGE/ScreenTransition.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef SCREENTRANSITION_H
+#define SCREENTRANSITION_H
 
 #include "RenderObject.h"
 
@@ -46,3 +47,4 @@ protected:
 #endif
 };
 
+#endif
diff --git a/BBGE/ScriptObject.h b/BBGE/ScriptObject.h
index 7847501..08cd693 100644
--- a/BBGE/ScriptObject.h
+++ b/BBGE/ScriptObject.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef SCRIPTOBJECT_H
+#define SCRIPTOBJECT_H
 
 enum ScriptObjectType
 {
@@ -79,3 +80,5 @@ public:
 	// public to allow the static compile check in ScriptInterface.cpp to work
 	ScriptObjectType _objtype;
 };
+
+#endif
diff --git a/BBGE/Shader.h b/BBGE/Shader.h
index d3cd105..1eb4cd9 100644
--- a/BBGE/Shader.h
+++ b/BBGE/Shader.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef BBGE_SHADER_H
+#define BBGE_SHADER_H
 
 #include "Base.h"
 
@@ -52,3 +53,5 @@ protected:
 	static bool _wasInited;
 	static bool _useShaders;
 };
+
+#endif
diff --git a/BBGE/SimpleIStringStream.h b/BBGE/SimpleIStringStream.h
index f323c04..25aa210 100644
--- a/BBGE/SimpleIStringStream.h
+++ b/BBGE/SimpleIStringStream.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef SIMPLEISTRINGSTREAM_H
+#define SIMPLEISTRINGSTREAM_H
 
 /*
  * This class implements a lightweight version of the std::istringstream
@@ -730,6 +731,8 @@ inline SimpleIStringStream &SimpleIStringStream::operator>>(std::string &target)
 #undef VERIFY_SETUP
 #undef VERIFY
 
+#endif // SIMPLEISTRINGSTREAM_H
+
 /*************************************************************************/
 /*************************************************************************/
 
diff --git a/BBGE/SkeletalSprite.h b/BBGE/SkeletalSprite.h
index 6d2165f..518f687 100644
--- a/BBGE/SkeletalSprite.h
+++ b/BBGE/SkeletalSprite.h
@@ -18,7 +18,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef SKELETALSPRITE_H
+#define SKELETALSPRITE_H
+
 #include "Quad.h"
 #include "SimpleIStringStream.h"
 // for 2d system only
@@ -273,4 +275,4 @@ protected:
 	void onUpdate(float dt);
 };
 
-
+#endif
diff --git a/BBGE/SoundManager.h b/BBGE/SoundManager.h
index 00da847..83f6b77 100644
--- a/BBGE/SoundManager.h
+++ b/BBGE/SoundManager.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef SOUNDMANAGER_H
+#define SOUNDMANAGER_H
 
 #include <string>
 #include <list>
@@ -250,3 +251,5 @@ private:
 };
 
 extern SoundManager *sound;
+
+#endif
diff --git a/BBGE/TTFFont.h b/BBGE/TTFFont.h
index c2fef01..48c1791 100644
--- a/BBGE/TTFFont.h
+++ b/BBGE/TTFFont.h
@@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#pragma once
+#ifndef BBGE_TTFFONT_H
+#define BBGE_TTFFONT_H
 
 #include "Base.h"
 #include "RenderObject.h"
@@ -69,3 +70,5 @@ protected:
 	TTFFont *font;
 	int hw,h;
 };
+
+#endif