From b8e019d8396ed102323df234df8b1cc6b35712a1 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 23 Feb 2012 10:41:31 +0000
Subject: use __ prefix on header guards to avoid mixing up defines with api
 functions / classes.

---
 source/gameengine/BlenderRoutines/BL_System.h                       | 6 +++---
 source/gameengine/BlenderRoutines/KX_BlenderCanvas.h                | 6 +++---
 source/gameengine/BlenderRoutines/KX_BlenderGL.h                    | 6 +++---
 source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h           | 6 +++---
 source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h        | 6 +++---
 source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h           | 6 +++---
 source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h           | 6 +++---
 source/gameengine/BlenderRoutines/KX_BlenderSystem.h                | 6 +++---
 source/gameengine/Converter/BL_ActionActuator.h                     | 4 ++--
 source/gameengine/Converter/BL_ArmatureActuator.h                   | 6 +++---
 source/gameengine/Converter/BL_ArmatureChannel.h                    | 6 +++---
 source/gameengine/Converter/BL_ArmatureConstraint.h                 | 6 +++---
 source/gameengine/Converter/BL_ArmatureObject.h                     | 4 ++--
 source/gameengine/Converter/BL_BlenderDataConversion.h              | 6 +++---
 source/gameengine/Converter/BL_DeformableGameObject.h               | 4 ++--
 source/gameengine/Converter/BL_MeshDeformer.h                       | 4 ++--
 source/gameengine/Converter/BL_ModifierDeformer.h                   | 4 ++--
 source/gameengine/Converter/BL_ShapeActionActuator.h                | 4 ++--
 source/gameengine/Converter/BL_ShapeDeformer.h                      | 4 ++--
 source/gameengine/Converter/BL_SkinDeformer.h                       | 4 ++--
 source/gameengine/Converter/BlenderWorldInfo.h                      | 6 +++---
 source/gameengine/Converter/KX_BlenderScalarInterpolator.h          | 6 +++---
 source/gameengine/Converter/KX_BlenderSceneConverter.h              | 6 +++---
 source/gameengine/Converter/KX_ConvertActuators.h                   | 6 +++---
 source/gameengine/Converter/KX_ConvertControllers.h                 | 6 +++---
 source/gameengine/Converter/KX_ConvertProperties.h                  | 6 +++---
 source/gameengine/Converter/KX_ConvertSensors.h                     | 6 +++---
 source/gameengine/Converter/KX_IpoConvert.h                         | 6 +++---
 source/gameengine/Converter/KX_SoftBodyDeformer.h                   | 4 ++--
 source/gameengine/Expressions/EXP_C-Api.h                           | 6 +++---
 source/gameengine/Expressions/IdentifierExpr.h                      | 6 +++---
 source/gameengine/Expressions/KX_HashedPtr.h                        | 6 +++---
 source/gameengine/Expressions/KX_Python.h                           | 6 +++---
 source/gameengine/Expressions/PyObjectPlus.h                        | 6 +++---
 source/gameengine/GameLogic/Joystick/SCA_Joystick.h                 | 4 ++--
 source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h          | 4 ++--
 source/gameengine/GameLogic/SCA_2DFilterActuator.h                  | 4 ++--
 source/gameengine/GameLogic/SCA_ANDController.h                     | 6 +++---
 source/gameengine/GameLogic/SCA_ActuatorEventManager.h              | 6 +++---
 source/gameengine/GameLogic/SCA_ActuatorSensor.h                    | 4 ++--
 source/gameengine/GameLogic/SCA_AlwaysEventManager.h                | 6 +++---
 source/gameengine/GameLogic/SCA_AlwaysSensor.h                      | 6 +++---
 source/gameengine/GameLogic/SCA_BasicEventManager.h                 | 6 +++---
 source/gameengine/GameLogic/SCA_DelaySensor.h                       | 4 ++--
 source/gameengine/GameLogic/SCA_EventManager.h                      | 4 ++--
 source/gameengine/GameLogic/SCA_ExpressionController.h              | 6 +++---
 source/gameengine/GameLogic/SCA_IActuator.h                         | 6 +++---
 source/gameengine/GameLogic/SCA_IController.h                       | 4 ++--
 source/gameengine/GameLogic/SCA_IInputDevice.h                      | 6 +++---
 source/gameengine/GameLogic/SCA_ILogicBrick.h                       | 4 ++--
 source/gameengine/GameLogic/SCA_IObject.h                           | 6 +++---
 source/gameengine/GameLogic/SCA_IScene.h                            | 6 +++---
 source/gameengine/GameLogic/SCA_ISensor.h                           | 6 +++---
 source/gameengine/GameLogic/SCA_JoystickManager.h                   | 4 ++--
 source/gameengine/GameLogic/SCA_KeyboardManager.h                   | 6 +++---
 source/gameengine/GameLogic/SCA_KeyboardSensor.h                    | 6 +++---
 source/gameengine/GameLogic/SCA_LogicManager.h                      | 6 +++---
 source/gameengine/GameLogic/SCA_MouseManager.h                      | 6 +++---
 source/gameengine/GameLogic/SCA_MouseSensor.h                       | 6 +++---
 source/gameengine/GameLogic/SCA_NANDController.h                    | 6 +++---
 source/gameengine/GameLogic/SCA_NORController.h                     | 6 +++---
 source/gameengine/GameLogic/SCA_ORController.h                      | 6 +++---
 source/gameengine/GameLogic/SCA_PropertyActuator.h                  | 4 ++--
 source/gameengine/GameLogic/SCA_PropertyEventManager.h              | 6 +++---
 source/gameengine/GameLogic/SCA_PropertySensor.h                    | 4 ++--
 source/gameengine/GameLogic/SCA_PythonController.h                  | 6 +++---
 source/gameengine/GameLogic/SCA_PythonKeyboard.h                    | 6 +++---
 source/gameengine/GameLogic/SCA_PythonMouse.h                       | 6 +++---
 source/gameengine/GameLogic/SCA_RandomActuator.h                    | 4 ++--
 source/gameengine/GameLogic/SCA_RandomEventManager.h                | 6 +++---
 source/gameengine/GameLogic/SCA_RandomNumberGenerator.h             | 6 +++---
 source/gameengine/GameLogic/SCA_RandomSensor.h                      | 6 +++---
 source/gameengine/GameLogic/SCA_TimeEventManager.h                  | 6 +++---
 source/gameengine/GameLogic/SCA_XNORController.h                    | 6 +++---
 source/gameengine/GameLogic/SCA_XORController.h                     | 6 +++---
 source/gameengine/GamePlayer/common/GPC_Canvas.h                    | 6 +++---
 source/gameengine/GamePlayer/common/GPC_Engine.h                    | 6 +++---
 source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h            | 4 ++--
 source/gameengine/GamePlayer/common/GPC_MouseDevice.h               | 6 +++---
 source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h      | 6 +++---
 source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h             | 6 +++---
 source/gameengine/GamePlayer/common/GPC_RenderTools.h               | 6 +++---
 source/gameengine/GamePlayer/common/GPC_System.h                    | 6 +++---
 source/gameengine/GamePlayer/ghost/GPG_Canvas.h                     | 6 +++---
 source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h             | 6 +++---
 source/gameengine/GamePlayer/ghost/GPG_System.h                     | 6 +++---
 source/gameengine/Ketsji/BL_Action.h                                | 4 ++--
 source/gameengine/Ketsji/BL_ActionManager.h                         | 4 ++--
 source/gameengine/Ketsji/BL_BlenderShader.h                         | 6 +++---
 source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h         | 6 +++---
 source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h      | 6 +++---
 source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h        | 6 +++---
 source/gameengine/Ketsji/KX_ArmatureSensor.h                        | 4 ++--
 source/gameengine/Ketsji/KX_BlenderMaterial.h                       | 4 ++--
 source/gameengine/Ketsji/KX_BulletPhysicsController.h               | 6 +++---
 source/gameengine/Ketsji/KX_Camera.h                                | 6 +++---
 source/gameengine/Ketsji/KX_CameraActuator.h                        | 6 +++---
 source/gameengine/Ketsji/KX_CameraIpoSGController.h                 | 6 +++---
 source/gameengine/Ketsji/KX_ClientObjectInfo.h                      | 6 +++---
 source/gameengine/Ketsji/KX_ConstraintActuator.h                    | 6 +++---
 source/gameengine/Ketsji/KX_ConstraintWrapper.h                     | 6 +++---
 source/gameengine/Ketsji/KX_ConvertPhysicsObject.h                  | 6 +++---
 source/gameengine/Ketsji/KX_EmptyObject.h                           | 6 +++---
 source/gameengine/Ketsji/KX_FontObject.h                            | 6 +++---
 source/gameengine/Ketsji/KX_GameActuator.h                          | 4 ++--
 source/gameengine/Ketsji/KX_GameObject.h                            | 6 +++---
 source/gameengine/Ketsji/KX_IInterpolator.h                         | 4 ++--
 source/gameengine/Ketsji/KX_IPOTransform.h                          | 4 ++--
 source/gameengine/Ketsji/KX_IPO_SGController.h                      | 6 +++---
 source/gameengine/Ketsji/KX_IPhysicsController.h                    | 6 +++---
 source/gameengine/Ketsji/KX_IScalarInterpolator.h                   | 4 ++--
 source/gameengine/Ketsji/KX_ISceneConverter.h                       | 6 +++---
 source/gameengine/Ketsji/KX_ISystem.h                               | 4 ++--
 source/gameengine/Ketsji/KX_IpoActuator.h                           | 6 +++---
 source/gameengine/Ketsji/KX_KetsjiEngine.h                          | 6 +++---
 source/gameengine/Ketsji/KX_Light.h                                 | 6 +++---
 source/gameengine/Ketsji/KX_LightIpoSGController.h                  | 6 +++---
 source/gameengine/Ketsji/KX_MeshProxy.h                             | 6 +++---
 source/gameengine/Ketsji/KX_MotionState.h                           | 6 +++---
 source/gameengine/Ketsji/KX_MouseFocusSensor.h                      | 4 ++--
 source/gameengine/Ketsji/KX_NavMeshObject.h                         | 6 +++---
 source/gameengine/Ketsji/KX_NearSensor.h                            | 6 +++---
 source/gameengine/Ketsji/KX_ObColorIpoSGController.h                | 6 +++---
 source/gameengine/Ketsji/KX_ObjectActuator.h                        | 6 +++---
 source/gameengine/Ketsji/KX_ObstacleSimulation.h                    | 4 ++--
 source/gameengine/Ketsji/KX_OrientationInterpolator.h               | 4 ++--
 source/gameengine/Ketsji/KX_ParentActuator.h                        | 4 ++--
 source/gameengine/Ketsji/KX_PhysicsEngineEnums.h                    | 6 +++---
 source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h                  | 6 +++---
 source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h             | 6 +++---
 source/gameengine/Ketsji/KX_PositionInterpolator.h                  | 4 ++--
 source/gameengine/Ketsji/KX_PyConstraintBinding.h                   | 6 +++---
 source/gameengine/Ketsji/KX_PythonInit.h                            | 6 +++---
 source/gameengine/Ketsji/KX_RadarSensor.h                           | 6 +++---
 source/gameengine/Ketsji/KX_RayEventManager.h                       | 6 +++---
 source/gameengine/Ketsji/KX_RaySensor.h                             | 6 +++---
 source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h                 | 4 ++--
 source/gameengine/Ketsji/KX_SCA_DynamicActuator.h                   | 4 ++--
 source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h                 | 4 ++--
 source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h               | 4 ++--
 source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h         | 4 ++--
 source/gameengine/Ketsji/KX_SG_NodeRelationships.h                  | 4 ++--
 source/gameengine/Ketsji/KX_ScalarInterpolator.h                    | 4 ++--
 source/gameengine/Ketsji/KX_ScalingInterpolator.h                   | 4 ++--
 source/gameengine/Ketsji/KX_Scene.h                                 | 6 +++---
 source/gameengine/Ketsji/KX_SceneActuator.h                         | 4 ++--
 source/gameengine/Ketsji/KX_SoundActuator.h                         | 6 +++---
 source/gameengine/Ketsji/KX_StateActuator.h                         | 4 ++--
 source/gameengine/Ketsji/KX_SteeringActuator.h                      | 4 ++--
 source/gameengine/Ketsji/KX_TimeCategoryLogger.h                    | 6 +++---
 source/gameengine/Ketsji/KX_TimeLogger.h                            | 6 +++---
 source/gameengine/Ketsji/KX_TouchEventManager.h                     | 6 +++---
 source/gameengine/Ketsji/KX_TouchSensor.h                           | 6 +++---
 source/gameengine/Ketsji/KX_TrackToActuator.h                       | 4 ++--
 source/gameengine/Ketsji/KX_VehicleWrapper.h                        | 6 +++---
 source/gameengine/Ketsji/KX_VertexProxy.h                           | 6 +++---
 source/gameengine/Ketsji/KX_VisibilityActuator.h                    | 4 ++--
 source/gameengine/Ketsji/KX_WorldInfo.h                             | 6 +++---
 source/gameengine/Ketsji/KX_WorldIpoController.h                    | 6 +++---
 .../Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h     | 6 +++---
 source/gameengine/Network/NG_NetworkDeviceInterface.h               | 6 +++---
 source/gameengine/Network/NG_NetworkMessage.h                       | 6 +++---
 source/gameengine/Network/NG_NetworkObject.h                        | 6 +++---
 source/gameengine/Network/NG_NetworkScene.h                         | 6 +++---
 source/gameengine/Physics/Bullet/CcdGraphicController.h             | 4 ++--
 source/gameengine/Physics/Bullet/CcdPhysicsController.h             | 6 +++---
 source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h            | 6 +++---
 source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h           | 6 +++---
 source/gameengine/Physics/common/PHY_DynamicTypes.h                 | 6 +++---
 source/gameengine/Physics/common/PHY_IController.h                  | 6 +++---
 source/gameengine/Physics/common/PHY_IGraphicController.h           | 6 +++---
 source/gameengine/Physics/common/PHY_IMotionState.h                 | 6 +++---
 source/gameengine/Physics/common/PHY_IPhysicsController.h           | 6 +++---
 source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h          | 6 +++---
 source/gameengine/Physics/common/PHY_IVehicle.h                     | 6 +++---
 source/gameengine/Physics/common/PHY_Pro.h                          | 6 +++---
 source/gameengine/Rasterizer/RAS_2DFilterManager.h                  | 4 ++--
 source/gameengine/Rasterizer/RAS_BucketManager.h                    | 6 +++---
 source/gameengine/Rasterizer/RAS_CameraData.h                       | 6 +++---
 source/gameengine/Rasterizer/RAS_Deformer.h                         | 4 ++--
 source/gameengine/Rasterizer/RAS_FramingManager.h                   | 4 ++--
 source/gameengine/Rasterizer/RAS_ICanvas.h                          | 6 +++---
 source/gameengine/Rasterizer/RAS_IPolygonMaterial.h                 | 6 +++---
 source/gameengine/Rasterizer/RAS_IRasterizer.h                      | 6 +++---
 source/gameengine/Rasterizer/RAS_IRenderTools.h                     | 6 +++---
 source/gameengine/Rasterizer/RAS_LightObject.h                      | 6 +++---
 source/gameengine/Rasterizer/RAS_MaterialBucket.h                   | 4 ++--
 source/gameengine/Rasterizer/RAS_MeshObject.h                       | 6 +++---
 source/gameengine/Rasterizer/RAS_ObjectColor.h                      | 6 +++---
 source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h   | 4 ++--
 .../gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h  | 4 ++--
 .../gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h   | 4 ++--
 .../gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h | 4 ++--
 source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h | 4 ++--
 .../gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h | 4 ++--
 .../gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h   | 4 ++--
 source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h  | 4 ++--
 .../gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h   | 4 ++--
 source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h  | 4 ++--
 .../Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h          | 6 +++---
 .../Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h        | 6 +++---
 source/gameengine/Rasterizer/RAS_Polygon.h                          | 4 ++--
 source/gameengine/Rasterizer/RAS_Rect.h                             | 6 +++---
 source/gameengine/Rasterizer/RAS_TexMatrix.h                        | 6 +++---
 source/gameengine/Rasterizer/RAS_TexVert.h                          | 6 +++---
 source/gameengine/SceneGraph/SG_Controller.h                        | 6 +++---
 source/gameengine/SceneGraph/SG_DList.h                             | 6 +++---
 source/gameengine/SceneGraph/SG_IObject.h                           | 6 +++---
 source/gameengine/SceneGraph/SG_Node.h                              | 6 +++---
 source/gameengine/SceneGraph/SG_ParentRelation.h                    | 4 ++--
 source/gameengine/SceneGraph/SG_QList.h                             | 6 +++---
 source/gameengine/SceneGraph/SG_Spatial.h                           | 6 +++---
 212 files changed, 570 insertions(+), 570 deletions(-)

(limited to 'source')

diff --git a/source/gameengine/BlenderRoutines/BL_System.h b/source/gameengine/BlenderRoutines/BL_System.h
index 7e523ea9b2b..b9f51393f44 100644
--- a/source/gameengine/BlenderRoutines/BL_System.h
+++ b/source/gameengine/BlenderRoutines/BL_System.h
@@ -31,8 +31,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef BL_SYSTEM_H
-#define BL_SYSTEM_H
+#ifndef __BL_SYSTEM_H__
+#define __BL_SYSTEM_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -66,5 +66,5 @@ extern void StartKetsjiShell(struct bContext *C, struct ARegion *ar,
 }
 #endif
 
-#endif /* BL_SYSTEM_H */
+#endif /* __BL_SYSTEM_H__ */
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
index 44dffb5bc54..184cc45f103 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __KX_BLENDERCANVAS
-#define __KX_BLENDERCANVAS
+#ifndef __KX_BLENDERCANVAS_H__
+#define __KX_BLENDERCANVAS_H__
 
 #ifdef WIN32
 #include <windows.h>
@@ -200,5 +200,5 @@ public:
 #endif
 };
 
-#endif // __KX_BLENDERCANVAS
+#endif // __KX_BLENDERCANVAS_H__
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.h b/source/gameengine/BlenderRoutines/KX_BlenderGL.h
index 6d8e2407793..3b89538df47 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderGL.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.h
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __BLENDERGL
-#define __BLENDERGL
+#ifndef __KX_BLENDERGL_H__
+#define __KX_BLENDERGL_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,5 +60,5 @@ void BL_print_gamedebug_line_padded(const char* text, int xco, int yco, int widt
 }
 #endif //__cplusplus
 
-#endif //__BLENDERGL
+#endif //__KX_BLENDERGL_H__
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
index 93bf133635d..18f163d7274 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __KX_BLENDERINPUTDEVICE
-#define __KX_BLENDERINPUTDEVICE
+#ifndef __KX_BLENDERINPUTDEVICE_H__
+#define __KX_BLENDERINPUTDEVICE_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning(disable : 4786)  // shut off 255 char limit debug template warning
@@ -77,5 +77,5 @@ public:
 	void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };
-#endif //__KX_BLENDERINPUTDEVICE
+#endif //__KX_BLENDERINPUTDEVICE_H__
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
index 3039e69efcd..84991b9a9ad 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __KX_BLENDERKEYBOARDDEVICE
-#define __KX_BLENDERKEYBOARDDEVICE
+#ifndef __KX_BLENDERKEYBOARDDEVICE_H__
+#define __KX_BLENDERKEYBOARDDEVICE_H__
 
 #include "KX_BlenderInputDevice.h"
 
@@ -61,5 +61,5 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERKEYBOARDDEVICE
+#endif //__KX_BLENDERKEYBOARDDEVICE_H__
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
index 9f0277fbc07..1c54b2fc000 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __KX_BLENDERMOUSEDEVICE
-#define __KX_BLENDERMOUSEDEVICE
+#ifndef __KX_BLENDERMOUSEDEVICE_H__
+#define __KX_BLENDERMOUSEDEVICE_H__
 
 #include "KX_BlenderInputDevice.h"
 
@@ -57,5 +57,5 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERMOUSEDEVICE
+#endif //__KX_BLENDERMOUSEDEVICE_H__
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
index f259e0ca1c3..a470e029758 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __KX_BLENDERRENDERTOOLS
-#define __KX_BLENDERRENDERTOOLS
+#ifndef __KX_BLENDERRENDERTOOLS_H__
+#define __KX_BLENDERRENDERTOOLS_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 // don't show stl-warnings
@@ -114,7 +114,7 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERRENDERTOOLS
+#endif //__KX_BLENDERRENDERTOOLS_H__
 
 
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderSystem.h b/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
index 526a7b12fbb..90685e426e6 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
@@ -30,8 +30,8 @@
  *  \brief Blender System embedding. Needed when gameengine runs embedded within Blender.
  */
 
-#ifndef __KX_BLENDERSYSTEM
-#define __KX_BLENDERSYSTEM
+#ifndef __KX_BLENDERSYSTEM_H__
+#define __KX_BLENDERSYSTEM_H__
 
 #include "KX_ISystem.h"
 
@@ -55,5 +55,5 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERSYSTEM
+#endif //__KX_BLENDERSYSTEM_H__
 
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h
index 29300281bb5..640a9a9ccb7 100644
--- a/source/gameengine/Converter/BL_ActionActuator.h
+++ b/source/gameengine/Converter/BL_ActionActuator.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_ACTIONACTUATOR
-#define BL_ACTIONACTUATOR
+#ifndef __BL_ACTIONACTUATOR_H__
+#define __BL_ACTIONACTUATOR_H__
 
 #include "CTR_HashedPtr.h"
 #include "SCA_IActuator.h"
diff --git a/source/gameengine/Converter/BL_ArmatureActuator.h b/source/gameengine/Converter/BL_ArmatureActuator.h
index 344b76ec278..761d429f784 100644
--- a/source/gameengine/Converter/BL_ArmatureActuator.h
+++ b/source/gameengine/Converter/BL_ArmatureActuator.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_ARMATUREACTUATOR
-#define BL_ARMATUREACTUATOR
+#ifndef __BL_ARMATUREACTUATOR_H__
+#define __BL_ARMATUREACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "BL_ArmatureConstraint.h"
@@ -91,6 +91,6 @@ private:
 	int				m_type;
 };
 
-#endif //BL_ARMATUREACTUATOR
+#endif //__BL_ARMATUREACTUATOR_H__
 
 
diff --git a/source/gameengine/Converter/BL_ArmatureChannel.h b/source/gameengine/Converter/BL_ArmatureChannel.h
index 585b6093a2b..3fd49c276ae 100644
--- a/source/gameengine/Converter/BL_ArmatureChannel.h
+++ b/source/gameengine/Converter/BL_ArmatureChannel.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __BL_ARMATURECHANNEL
-#define __BL_ARMATURECHANNEL
+#ifndef __BL_ARMATURECHANNEL_H__
+#define __BL_ARMATURECHANNEL_H__
 
 #include "DNA_action_types.h"
 #include "CTR_HashedPtr.h"
@@ -94,5 +94,5 @@ public:
 };
 
 
-#endif //__BL_ARMATURECHANNEL
+#endif //__BL_ARMATURECHANNEL_H__
 
diff --git a/source/gameengine/Converter/BL_ArmatureConstraint.h b/source/gameengine/Converter/BL_ArmatureConstraint.h
index 2abb36ff937..89bad520563 100644
--- a/source/gameengine/Converter/BL_ArmatureConstraint.h
+++ b/source/gameengine/Converter/BL_ArmatureConstraint.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __BL_ARMATURECONSTRAINT
-#define __BL_ARMATURECONSTRAINT
+#ifndef __BL_ARMATURECONSTRAINT_H__
+#define __BL_ARMATURECONSTRAINT_H__
 
 #include "DNA_constraint_types.h"
 #include "CTR_HashedPtr.h"
@@ -117,5 +117,5 @@ public:
 #endif // WITH_PYTHON
 };
 
-#endif //__BL_ARMATURECONSTRAINT
+#endif //__BL_ARMATURECONSTRAINT_H__
 
diff --git a/source/gameengine/Converter/BL_ArmatureObject.h b/source/gameengine/Converter/BL_ArmatureObject.h
index 745ffac0cb2..a6848cf57df 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.h
+++ b/source/gameengine/Converter/BL_ArmatureObject.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_ARMATUREOBJECT
-#define BL_ARMATUREOBJECT
+#ifndef __BL_ARMATUREOBJECT_H__
+#define __BL_ARMATUREOBJECT_H__
 
 #include "KX_GameObject.h"
 #include "BL_ArmatureConstraint.h"
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.h b/source/gameengine/Converter/BL_BlenderDataConversion.h
index 6da3ac90aef..e6c35c20f4c 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.h
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __BLENDER_CONVERT
-#define __BLENDER_CONVERT
+#ifndef __BL_BLENDERDATACONVERSION_H__
+#define __BL_BLENDERDATACONVERSION_H__
 
 #include "CTR_HashedPtr.h"
 #include "STR_String.h"
@@ -52,5 +52,5 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 
 SCA_IInputDevice::KX_EnumInputs ConvertKeyCode(int key_code);
 
-#endif // __BLENDER_CONVERT
+#endif // __BL_BLENDERDATACONVERSION_H__
 
diff --git a/source/gameengine/Converter/BL_DeformableGameObject.h b/source/gameengine/Converter/BL_DeformableGameObject.h
index e86fff4fe69..b86069bca1b 100644
--- a/source/gameengine/Converter/BL_DeformableGameObject.h
+++ b/source/gameengine/Converter/BL_DeformableGameObject.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_DEFORMABLEGAMEOBJECT
-#define BL_DEFORMABLEGAMEOBJECT
+#ifndef __BL_DEFORMABLEGAMEOBJECT_H__
+#define __BL_DEFORMABLEGAMEOBJECT_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h
index 9c2065bddb8..48775d6031a 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.h
+++ b/source/gameengine/Converter/BL_MeshDeformer.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_MESHDEFORMER
-#define BL_MESHDEFORMER
+#ifndef __BL_MESHDEFORMER_H__
+#define __BL_MESHDEFORMER_H__
 
 #include "RAS_Deformer.h"
 #include "DNA_object_types.h"
diff --git a/source/gameengine/Converter/BL_ModifierDeformer.h b/source/gameengine/Converter/BL_ModifierDeformer.h
index c9cd9153153..163b2dd108f 100644
--- a/source/gameengine/Converter/BL_ModifierDeformer.h
+++ b/source/gameengine/Converter/BL_ModifierDeformer.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_MODIFIERDEFORMER
-#define BL_MODIFIERDEFORMER
+#ifndef __BL_MODIFIERDEFORMER_H__
+#define __BL_MODIFIERDEFORMER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.h b/source/gameengine/Converter/BL_ShapeActionActuator.h
index 90f44acb672..b88631c89d6 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.h
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_SHAPEACTIONACTUATOR
-#define BL_SHAPEACTIONACTUATOR
+#ifndef __BL_SHAPEACTIONACTUATOR_H__
+#define __BL_SHAPEACTIONACTUATOR_H__
 
 #include "CTR_HashedPtr.h"
 #include "SCA_IActuator.h"
diff --git a/source/gameengine/Converter/BL_ShapeDeformer.h b/source/gameengine/Converter/BL_ShapeDeformer.h
index c768b2e1e75..6b55d5b26f9 100644
--- a/source/gameengine/Converter/BL_ShapeDeformer.h
+++ b/source/gameengine/Converter/BL_ShapeDeformer.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_SHAPEDEFORMER
-#define BL_SHAPEDEFORMER
+#ifndef __BL_SHAPEDEFORMER_H__
+#define __BL_SHAPEDEFORMER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h
index afec027e099..dd8577b382e 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.h
+++ b/source/gameengine/Converter/BL_SkinDeformer.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_SKINDEFORMER
-#define BL_SKINDEFORMER
+#ifndef __BL_SKINDEFORMER_H__
+#define __BL_SKINDEFORMER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
diff --git a/source/gameengine/Converter/BlenderWorldInfo.h b/source/gameengine/Converter/BlenderWorldInfo.h
index 5d6ee6eaf19..e6f274b777e 100644
--- a/source/gameengine/Converter/BlenderWorldInfo.h
+++ b/source/gameengine/Converter/BlenderWorldInfo.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __BLENDERWORLDINFO_H
-#define __BLENDERWORLDINFO_H
+#ifndef __BLENDERWORLDINFO_H__
+#define __BLENDERWORLDINFO_H__
 #include "MT_CmMatrix4x4.h"
 #include "KX_WorldInfo.h"
 #include "KX_BlenderGL.h"
@@ -106,5 +106,5 @@ public:
 #endif
 };
 
-#endif //__BLENDERWORLDINFO_H
+#endif //__BLENDERWORLDINFO_H__
 
diff --git a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
index 23aef75e48f..fc08d3b54d6 100644
--- a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
+++ b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_SCALARINTERPOLATOR_H
-#define __KX_SCALARINTERPOLATOR_H
+#ifndef __KX_BLENDERSCALARINTERPOLATOR_H__
+#define __KX_BLENDERSCALARINTERPOLATOR_H__
 
 #include <vector>
 
@@ -77,5 +77,5 @@ public:
 #endif
 };
 
-#endif //__KX_SCALARINTERPOLATOR_H
+#endif //__KX_BLENDERSCALARINTERPOLATOR_H__
 
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h
index 9c2143d2cab..f3c4627693b 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.h
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_BLENDERSCENECONVERTER_H
-#define __KX_BLENDERSCENECONVERTER_H
+#ifndef __KX_BLENDERSCENECONVERTER_H__
+#define __KX_BLENDERSCENECONVERTER_H__
 
 #include "KX_HashedPtr.h"
 #include "CTR_Map.h"
@@ -197,5 +197,5 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERSCENECONVERTER_H
+#endif //__KX_BLENDERSCENECONVERTER_H__
 
diff --git a/source/gameengine/Converter/KX_ConvertActuators.h b/source/gameengine/Converter/KX_ConvertActuators.h
index 836bcd860fa..b7c890458cc 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.h
+++ b/source/gameengine/Converter/KX_ConvertActuators.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_CONVERTACTUATORS_H
-#define __KX_CONVERTACTUATORS_H
+#ifndef __KX_CONVERTACTUATORS_H__
+#define __KX_CONVERTACTUATORS_H__
 
 void BL_ConvertActuators(const char* maggiename,
 	 struct Object* blenderobject,
@@ -44,5 +44,5 @@ void BL_ConvertActuators(const char* maggiename,
 	 class KX_BlenderSceneConverter* converter);
 
 
-#endif //__KX_CONVERTACTUATORS_H
+#endif //__KX_CONVERTACTUATORS_H__
 
diff --git a/source/gameengine/Converter/KX_ConvertControllers.h b/source/gameengine/Converter/KX_ConvertControllers.h
index 19045dc26d1..d1d52f866ec 100644
--- a/source/gameengine/Converter/KX_ConvertControllers.h
+++ b/source/gameengine/Converter/KX_ConvertControllers.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_CONVERTCONTROLLERS_H
-#define __KX_CONVERTCONTROLLERS_H
+#ifndef __KX_CONVERTCONTROLLERS_H__
+#define __KX_CONVERTCONTROLLERS_H__
 
 #include "KX_Python.h"
 
@@ -44,5 +44,5 @@ void BL_ConvertControllers(
 );
 
 
-#endif //__KX_CONVERTCONTROLLERS_H
+#endif //__KX_CONVERTCONTROLLERS_H__
 
diff --git a/source/gameengine/Converter/KX_ConvertProperties.h b/source/gameengine/Converter/KX_ConvertProperties.h
index b151b70019d..5bfe202a539 100644
--- a/source/gameengine/Converter/KX_ConvertProperties.h
+++ b/source/gameengine/Converter/KX_ConvertProperties.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_CONVERTPROPERTIES
-#define __KX_CONVERTPROPERTIES
+#ifndef __KX_CONVERTPROPERTIES_H__
+#define __KX_CONVERTPROPERTIES_H__
 
 void BL_ConvertProperties(struct Object* object,
   class KX_GameObject* gameobj,
@@ -38,5 +38,5 @@ void BL_ConvertProperties(struct Object* object,
   class SCA_IScene* scene,
   bool isInActiveLayer);
 
-#endif //__KX_CONVERTPROPERTIES
+#endif //__KX_CONVERTPROPERTIES_H__
 
diff --git a/source/gameengine/Converter/KX_ConvertSensors.h b/source/gameengine/Converter/KX_ConvertSensors.h
index 1405aee8701..0694815c77e 100644
--- a/source/gameengine/Converter/KX_ConvertSensors.h
+++ b/source/gameengine/Converter/KX_ConvertSensors.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_CONVERTSENSOR_H
-#define __KX_CONVERTSENSOR_H
+#ifndef __KX_CONVERTSENSORS_H__
+#define __KX_CONVERTSENSORS_H__
 
 void BL_ConvertSensors(struct Object* blenderobject,
 	   class KX_GameObject* gameobj,
@@ -42,5 +42,5 @@ void BL_ConvertSensors(struct Object* blenderobject,
 	   class RAS_ICanvas* canvas, 
 	   class KX_BlenderSceneConverter* converter);
 
-#endif //__KX_CONVERTSENSOR_H
+#endif //__KX_CONVERTSENSORS_H__
 
diff --git a/source/gameengine/Converter/KX_IpoConvert.h b/source/gameengine/Converter/KX_IpoConvert.h
index 49ac6f0b89a..7bb2df978f6 100644
--- a/source/gameengine/Converter/KX_IpoConvert.h
+++ b/source/gameengine/Converter/KX_IpoConvert.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_IPOCONVERT_H
-#define __KX_IPOCONVERT_H
+#ifndef __KX_IPOCONVERT_H__
+#define __KX_IPOCONVERT_H__
 
 struct Object;
 
@@ -66,5 +66,5 @@ void BL_ConvertMaterialIpos(struct Object* blenderobject,
 	class KX_BlenderSceneConverter *converter);
 
 
-#endif //__KX_IPOCONVERT_H
+#endif //__KX_IPOCONVERT_H__
 
diff --git a/source/gameengine/Converter/KX_SoftBodyDeformer.h b/source/gameengine/Converter/KX_SoftBodyDeformer.h
index 6e3ca739501..5235c91ce89 100644
--- a/source/gameengine/Converter/KX_SoftBodyDeformer.h
+++ b/source/gameengine/Converter/KX_SoftBodyDeformer.h
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef KX_SOFTBODYDEFORMER
-#define KX_SOFTBODYDEFORMER
+#ifndef __KX_SOFTBODYDEFORMER_H__
+#define __KX_SOFTBODYDEFORMER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
diff --git a/source/gameengine/Expressions/EXP_C-Api.h b/source/gameengine/Expressions/EXP_C-Api.h
index 2f179547a2b..6be1e57481c 100644
--- a/source/gameengine/Expressions/EXP_C-Api.h
+++ b/source/gameengine/Expressions/EXP_C-Api.h
@@ -29,8 +29,8 @@
  *  \ingroup expressions
  */
 
-#ifndef __EXPRESSION_INCLUDE
-#define __EXPRESSION_INCLUDE
+#ifndef __EXP_C_API_H__
+#define __EXP_C_API_H__
 
 #define EXP_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
 
@@ -64,5 +64,5 @@ const char*					EXP_GetText(EXP_ValueHandle);
 }
 #endif
 
-#endif //__EXPRESSION_INCLUDE
+#endif //__EXP_C_API_H__
 
diff --git a/source/gameengine/Expressions/IdentifierExpr.h b/source/gameengine/Expressions/IdentifierExpr.h
index bf996f5e2f0..632a1e0a6d9 100644
--- a/source/gameengine/Expressions/IdentifierExpr.h
+++ b/source/gameengine/Expressions/IdentifierExpr.h
@@ -29,8 +29,8 @@
  *  \ingroup expressions
  */
 
-#ifndef __IDENTIFIER_EXPR
-#define __IDENTIFIER_EXPR
+#ifndef __IDENTIFIEREXPR_H__
+#define __IDENTIFIEREXPR_H__
 
 #include "Expression.h"
 
@@ -58,5 +58,5 @@ public:
 #endif
 };
 
-#endif //__IDENTIFIER_EXPR
+#endif //__IDENTIFIEREXPR_H__
 
diff --git a/source/gameengine/Expressions/KX_HashedPtr.h b/source/gameengine/Expressions/KX_HashedPtr.h
index 8f2b524b595..edb68f2861d 100644
--- a/source/gameengine/Expressions/KX_HashedPtr.h
+++ b/source/gameengine/Expressions/KX_HashedPtr.h
@@ -29,8 +29,8 @@
  *  \ingroup expressions
  */
 
-#ifndef __KX_HASHEDPTR
-#define __KX_HASHEDPTR
+#ifndef __KX_HASHEDPTR_H__
+#define __KX_HASHEDPTR_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -60,5 +60,5 @@ public:
 #endif
 };
 
-#endif //__KX_HASHEDPTR
+#endif //__KX_HASHEDPTR_H__
 
diff --git a/source/gameengine/Expressions/KX_Python.h b/source/gameengine/Expressions/KX_Python.h
index 98f8d922bea..4a7ce4d3fb7 100644
--- a/source/gameengine/Expressions/KX_Python.h
+++ b/source/gameengine/Expressions/KX_Python.h
@@ -29,8 +29,8 @@
  *  \ingroup expressions
  */
 
-#ifndef KX_PYTHON_H
-#define KX_PYTHON_H
+#ifndef __KX_PYTHON_H__
+#define __KX_PYTHON_H__
 
 //#define USE_DL_EXPORT
 
@@ -79,5 +79,5 @@
 #undef toupper
 #endif
 
-#endif // KX_PYTHON_H
+#endif // __KX_PYTHON_H__
 
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index 107ae453c8e..27c948ecaa9 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -29,8 +29,8 @@
  *  \ingroup expressions
  */
 
-#ifndef _PY_OBJECT_PLUS_H
-#define _PY_OBJECT_PLUS_H
+#ifndef __PYOBJECTPLUS_H__
+#define __PYOBJECTPLUS_H__
 
 /* for now keep weakrefs optional */
 #define USE_WEAKREFS
@@ -652,4 +652,4 @@ PyObject *py_getattr_dict(PyObject *pydict, PyObject *tp_dict);
 PyObject *PyUnicode_From_STR_String(const STR_String& str);
 #endif
 
-#endif //  _PY_OBJECT_PLUS_H
+#endif //  __PYOBJECTPLUS_H__
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
index 4e3e3ef656d..75a7ff73b4c 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef _SCA_JOYSTICK_H_
-#define _SCA_JOYSTICK_H_
+#ifndef __SCA_JOYSTICK_H__
+#define __SCA_JOYSTICK_H__
 
 #include "SCA_JoystickDefines.h"
 #ifdef WITH_SDL
diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h b/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
index 69fc393cbd7..45766eb9057 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
+++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef _SCA_JOYSTICKDEFINES_H_
-#define _SCA_JOYSTICKDEFINES_H_
+#ifndef __SCA_JOYSTICKDEFINES_H__
+#define __SCA_JOYSTICKDEFINES_H__
 
 #ifdef main
 #undef main
diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.h b/source/gameengine/GameLogic/SCA_2DFilterActuator.h
index 42446b7a2b1..a754d950859 100644
--- a/source/gameengine/GameLogic/SCA_2DFilterActuator.h
+++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.h
@@ -28,8 +28,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __SCA_2DFILETRACTUATOR_H__
-#define __SCA_2DFILETRACTUATOR_H__
+#ifndef __SCA_2DFILTERACTUATOR_H__
+#define __SCA_2DFILTERACTUATOR_H__
 
 #include "RAS_IRasterizer.h"
 #include "SCA_IActuator.h"
diff --git a/source/gameengine/GameLogic/SCA_ANDController.h b/source/gameengine/GameLogic/SCA_ANDController.h
index 363bca630aa..ccc3f9be3af 100644
--- a/source/gameengine/GameLogic/SCA_ANDController.h
+++ b/source/gameengine/GameLogic/SCA_ANDController.h
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ANDCONTROLLER
-#define __KX_ANDCONTROLLER
+#ifndef __SCA_ANDCONTROLLER_H__
+#define __SCA_ANDCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -48,5 +48,5 @@ public:
 	virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__KX_ANDCONTROLLER
+#endif //__SCA_ANDCONTROLLER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_ActuatorEventManager.h b/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
index f4d2d7dfd7d..b91e6f872a2 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
+++ b/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ACTUATOREVENTMANAGER
-#define __KX_ACTUATOREVENTMANAGER
+#ifndef __SCA_ACTUATOREVENTMANAGER_H__
+#define __SCA_ACTUATOREVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 
@@ -55,5 +55,5 @@ public:
 #endif
 };
 
-#endif //__KX_ACTUATOREVENTMANAGER
+#endif //__SCA_ACTUATOREVENTMANAGER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.h b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
index e7a7525bb40..e40c2492b8a 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorSensor.h
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ACTUATORSENSOR
-#define __KX_ACTUATORSENSOR
+#ifndef __SCA_ACTUATORSENSOR_H__
+#define __SCA_ACTUATORSENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "SCA_IActuator.h"
diff --git a/source/gameengine/GameLogic/SCA_AlwaysEventManager.h b/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
index 2801d649237..21ac55d36a4 100644
--- a/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
+++ b/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ALWAYSEVENTMGR
-#define __KX_ALWAYSEVENTMGR
+#ifndef __SCA_ALWAYSEVENTMANAGER_H__
+#define __SCA_ALWAYSEVENTMANAGER_H__
 #include "SCA_EventManager.h"
 #include <vector>
 
@@ -49,5 +49,5 @@ public:
 #endif
 };
 
-#endif //__KX_ALWAYSEVENTMGR
+#endif //__SCA_ALWAYSEVENTMANAGER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_AlwaysSensor.h b/source/gameengine/GameLogic/SCA_AlwaysSensor.h
index 8748793d9a3..d0963fd0ea1 100644
--- a/source/gameengine/GameLogic/SCA_AlwaysSensor.h
+++ b/source/gameengine/GameLogic/SCA_AlwaysSensor.h
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ALWAYSSENSOR
-#define __KX_ALWAYSSENSOR
+#ifndef __SCA_ALWAYSSENSOR_H__
+#define __SCA_ALWAYSSENSOR_H__
 #include "SCA_ISensor.h"
 
 class SCA_AlwaysSensor : public SCA_ISensor
@@ -50,5 +50,5 @@ public:
 	virtual void Init();
 };
 
-#endif //__KX_ALWAYSSENSOR
+#endif //__SCA_ALWAYSSENSOR_H__
 
diff --git a/source/gameengine/GameLogic/SCA_BasicEventManager.h b/source/gameengine/GameLogic/SCA_BasicEventManager.h
index 73e3babbdcf..9d08a7785e2 100644
--- a/source/gameengine/GameLogic/SCA_BasicEventManager.h
+++ b/source/gameengine/GameLogic/SCA_BasicEventManager.h
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __SCA_BASICEVENTMGR
-#define __SCA_BASICEVENTMGR
+#ifndef __SCA_BASICEVENTMANAGER_H__
+#define __SCA_BASICEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 #include <vector>
@@ -56,5 +56,5 @@ public:
 #endif
 };
 
-#endif //__SCA_BASICEVENTMGR
+#endif //__SCA_BASICEVENTMANAGER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.h b/source/gameengine/GameLogic/SCA_DelaySensor.h
index ccb8f00c548..2c408921f27 100644
--- a/source/gameengine/GameLogic/SCA_DelaySensor.h
+++ b/source/gameengine/GameLogic/SCA_DelaySensor.h
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_DELAYSENSOR
-#define __KX_DELAYSENSOR
+#ifndef __SCA_DELAYSENSOR_H__
+#define __SCA_DELAYSENSOR_H__
 #include "SCA_ISensor.h"
 
 class SCA_DelaySensor : public SCA_ISensor
diff --git a/source/gameengine/GameLogic/SCA_EventManager.h b/source/gameengine/GameLogic/SCA_EventManager.h
index ea24b5c038b..933fdc5190a 100644
--- a/source/gameengine/GameLogic/SCA_EventManager.h
+++ b/source/gameengine/GameLogic/SCA_EventManager.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_EVENTMANAGER
-#define __KX_EVENTMANAGER
+#ifndef __SCA_EVENTMANAGER_H__
+#define __SCA_EVENTMANAGER_H__
 
 #include <vector>
 #include <set>
diff --git a/source/gameengine/GameLogic/SCA_ExpressionController.h b/source/gameengine/GameLogic/SCA_ExpressionController.h
index 93a3f08c95f..47401ea5807 100644
--- a/source/gameengine/GameLogic/SCA_ExpressionController.h
+++ b/source/gameengine/GameLogic/SCA_ExpressionController.h
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_EXPRESSIONCONTROLLER
-#define __KX_EXPRESSIONCONTROLLER
+#ifndef __SCA_EXPRESSIONCONTROLLER_H__
+#define __SCA_EXPRESSIONCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -65,5 +65,5 @@ public:
 #endif
 };
 
-#endif //__KX_EXPRESSIONCONTROLLER
+#endif //__SCA_EXPRESSIONCONTROLLER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_IActuator.h b/source/gameengine/GameLogic/SCA_IActuator.h
index feb21a721d5..211a25b84c8 100644
--- a/source/gameengine/GameLogic/SCA_IActuator.h
+++ b/source/gameengine/GameLogic/SCA_IActuator.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_IACTUATOR
-#define __KX_IACTUATOR
+#ifndef __SCA_IACTUATOR_H__
+#define __SCA_IACTUATOR_H__
 
 #include "SCA_IController.h"
 #include <vector>
@@ -166,5 +166,5 @@ public:
 #endif
 };
 
-#endif //__KX_IACTUATOR
+#endif //__SCA_IACTUATOR_H__
 
diff --git a/source/gameengine/GameLogic/SCA_IController.h b/source/gameengine/GameLogic/SCA_IController.h
index 5481f2ae8e4..1b15547d898 100644
--- a/source/gameengine/GameLogic/SCA_IController.h
+++ b/source/gameengine/GameLogic/SCA_IController.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ICONTROLLER
-#define __KX_ICONTROLLER
+#ifndef __SCA_ICONTROLLER_H__
+#define __SCA_ICONTROLLER_H__
 
 #include "SCA_ILogicBrick.h"
 #include "PyObjectPlus.h"
diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h
index 5c36d88e29d..ee9fa97c992 100644
--- a/source/gameengine/GameLogic/SCA_IInputDevice.h
+++ b/source/gameengine/GameLogic/SCA_IInputDevice.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef KX_INPUTDEVICE_H
-#define KX_INPUTDEVICE_H
+#ifndef __SCA_IINPUTDEVICE_H__
+#define __SCA_IINPUTDEVICE_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -322,5 +322,5 @@ public:
 #endif
 };
 
-#endif	//KX_INPUTDEVICE_H
+#endif	//__SCA_IINPUTDEVICE_H__
 
diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.h b/source/gameengine/GameLogic/SCA_ILogicBrick.h
index 051bc2aafce..9a23244fa96 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.h
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ILOGICBRICK
-#define __KX_ILOGICBRICK
+#ifndef __SCA_ILOGICBRICK_H__
+#define __SCA_ILOGICBRICK_H__
 
 #include "Value.h"
 #include "SCA_IObject.h"
diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h
index b0a03de1242..0e657794195 100644
--- a/source/gameengine/GameLogic/SCA_IObject.h
+++ b/source/gameengine/GameLogic/SCA_IObject.h
@@ -31,8 +31,8 @@
  *   SceneGraph
  */
 
-#ifndef SCA_IOBJECT_H
-#define SCA_IOBJECT_H
+#ifndef __SCA_IOBJECT_H__
+#define __SCA_IOBJECT_H__
 
 #include "Value.h"
 #include <vector>
@@ -225,5 +225,5 @@ public:
 
 };
 
-#endif //SCA_IOBJECT_H
+#endif //__SCA_IOBJECT_H__
 
diff --git a/source/gameengine/GameLogic/SCA_IScene.h b/source/gameengine/GameLogic/SCA_IScene.h
index 6f048b77acf..e7806ea0746 100644
--- a/source/gameengine/GameLogic/SCA_IScene.h
+++ b/source/gameengine/GameLogic/SCA_IScene.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ISCENE_H
-#define __KX_ISCENE_H
+#ifndef __SCA_ISCENE_H__
+#define __SCA_ISCENE_H__
 
 #include <vector>
 
@@ -80,5 +80,5 @@ public:
 #endif
 };
 
-#endif //__KX_ISCENE_H
+#endif //__SCA_ISCENE_H__
 
diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h
index ef082095c0d..1e10bcc08fd 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.h
+++ b/source/gameengine/GameLogic/SCA_ISensor.h
@@ -31,8 +31,8 @@
  *   pulsemode and pulsefrequency, and event suppression.
  */
 
-#ifndef __SCA_ISENSOR
-#define __SCA_ISENSOR
+#ifndef __SCA_ISENSOR_H__
+#define __SCA_ISENSOR_H__
 
 #include "SCA_IController.h"
 
@@ -215,5 +215,5 @@ public:
 #endif // WITH_PYTHON
 };
 
-#endif //__SCA_ISENSOR
+#endif //__SCA_ISENSOR_H__
 
diff --git a/source/gameengine/GameLogic/SCA_JoystickManager.h b/source/gameengine/GameLogic/SCA_JoystickManager.h
index dc778f231af..dcdd667cb1a 100644
--- a/source/gameengine/GameLogic/SCA_JoystickManager.h
+++ b/source/gameengine/GameLogic/SCA_JoystickManager.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __JOYSTICKMANAGER_H_
-#define __JOYSTICKMANAGER_H_
+#ifndef __SCA_JOYSTICKMANAGER_H__
+#define __SCA_JOYSTICKMANAGER_H__
 
 #include "SCA_EventManager.h"
 #include "Joystick/SCA_Joystick.h"
diff --git a/source/gameengine/GameLogic/SCA_KeyboardManager.h b/source/gameengine/GameLogic/SCA_KeyboardManager.h
index 55dd189d9d1..5706d16ae19 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardManager.h
+++ b/source/gameengine/GameLogic/SCA_KeyboardManager.h
@@ -31,8 +31,8 @@
  *
  */
 
-#ifndef __KX_KEYBOARDMANAGER
-#define __KX_KEYBOARDMANAGER
+#ifndef __SCA_KEYBOARDMANAGER_H__
+#define __SCA_KEYBOARDMANAGER_H__
 
 
 #include "SCA_EventManager.h"
@@ -65,5 +65,5 @@ public:
 #endif
 };
 
-#endif //__KX_KEYBOARDMANAGER
+#endif //__SCA_KEYBOARDMANAGER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
index 441c833d3a8..8e21d6bfde1 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
@@ -30,8 +30,8 @@
  *  \brief Sensor for keyboard input
  */
 
-#ifndef __KX_KEYBOARDSENSOR
-#define __KX_KEYBOARDSENSOR
+#ifndef __SCA_KEYBOARDSENSOR_H__
+#define __SCA_KEYBOARDSENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "BoolValue.h"
@@ -137,7 +137,7 @@ bool IsPrintable(int keyIndex);
 bool IsDelete(int keyIndex);
 
 
-#endif //__KX_KEYBOARDSENSOR
+#endif //__SCA_KEYBOARDSENSOR_H__
 
 
 
diff --git a/source/gameengine/GameLogic/SCA_LogicManager.h b/source/gameengine/GameLogic/SCA_LogicManager.h
index ec8343075d8..8671aa6c796 100644
--- a/source/gameengine/GameLogic/SCA_LogicManager.h
+++ b/source/gameengine/GameLogic/SCA_LogicManager.h
@@ -28,8 +28,8 @@
  *  \ingroup gamelogic
  *  \brief Regulates the top-level logic behaviour for one scene.
  */
-#ifndef __KX_LOGICMANAGER
-#define __KX_LOGICMANAGER
+#ifndef __SCA_LOGICMANAGER_H__
+#define __SCA_LOGICMANAGER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786)
@@ -153,5 +153,5 @@ public:
 #endif
 };
 
-#endif //__KX_LOGICMANAGER
+#endif //__SCA_LOGICMANAGER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_MouseManager.h b/source/gameengine/GameLogic/SCA_MouseManager.h
index d22d27be394..66a838651c2 100644
--- a/source/gameengine/GameLogic/SCA_MouseManager.h
+++ b/source/gameengine/GameLogic/SCA_MouseManager.h
@@ -32,8 +32,8 @@
  */
 
 
-#ifndef __KX_MOUSEMANAGER
-#define __KX_MOUSEMANAGER
+#ifndef __SCA_MOUSEMANAGER_H__
+#define __SCA_MOUSEMANAGER_H__
 
 
 #include "SCA_EventManager.h"
@@ -74,5 +74,5 @@ public:
 #endif
 };
 
-#endif //__KX_MOUSEMANAGER
+#endif //__SCA_MOUSEMANAGER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h
index 91352ce58bc..d4eff371d4a 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.h
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.h
@@ -30,8 +30,8 @@
  *  \brief Senses mouse events
  */
 
-#ifndef __KX_MOUSESENSOR
-#define __KX_MOUSESENSOR
+#ifndef __SCA_MOUSESENSOR_H__
+#define __SCA_MOUSESENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "BoolValue.h"
@@ -117,5 +117,5 @@ class SCA_MouseSensor : public SCA_ISensor
 #endif
 };
 
-#endif //__KX_MOUSESENSOR
+#endif //__SCA_MOUSESENSOR_H__
 
diff --git a/source/gameengine/GameLogic/SCA_NANDController.h b/source/gameengine/GameLogic/SCA_NANDController.h
index 723d2a5fe0d..040df7f0ade 100644
--- a/source/gameengine/GameLogic/SCA_NANDController.h
+++ b/source/gameengine/GameLogic/SCA_NANDController.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_NANDCONTROLLER
-#define __KX_NANDCONTROLLER
+#ifndef __SCA_NANDCONTROLLER_H__
+#define __SCA_NANDCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -49,5 +49,5 @@ public:
 	/* --------------------------------------------------------------------- */
 };
 
-#endif //__KX_NANDCONTROLLER
+#endif //__SCA_NANDCONTROLLER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_NORController.h b/source/gameengine/GameLogic/SCA_NORController.h
index 26d7e925923..1630f8055ec 100644
--- a/source/gameengine/GameLogic/SCA_NORController.h
+++ b/source/gameengine/GameLogic/SCA_NORController.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_NORCONTROLLER
-#define __KX_NORCONTROLLER
+#ifndef __SCA_NORCONTROLLER_H__
+#define __SCA_NORCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -45,5 +45,5 @@ public:
 	virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__KX_NORCONTROLLER
+#endif //__SCA_NORCONTROLLER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_ORController.h b/source/gameengine/GameLogic/SCA_ORController.h
index 53debf894a3..9a4e4c7398d 100644
--- a/source/gameengine/GameLogic/SCA_ORController.h
+++ b/source/gameengine/GameLogic/SCA_ORController.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ORCONTROLLER
-#define __KX_ORCONTROLLER
+#ifndef __SCA_ORCONTROLLER_H__
+#define __SCA_ORCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -46,5 +46,5 @@ public:
 	virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__KX_ORCONTROLLER
+#endif //__SCA_ORCONTROLLER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.h b/source/gameengine/GameLogic/SCA_PropertyActuator.h
index 17419e34c2a..e465098131e 100644
--- a/source/gameengine/GameLogic/SCA_PropertyActuator.h
+++ b/source/gameengine/GameLogic/SCA_PropertyActuator.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_PROPERTYACTUATOR
-#define __KX_PROPERTYACTUATOR
+#ifndef __SCA_PROPERTYACTUATOR_H__
+#define __SCA_PROPERTYACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
diff --git a/source/gameengine/GameLogic/SCA_PropertyEventManager.h b/source/gameengine/GameLogic/SCA_PropertyEventManager.h
index 3e8a947410b..7d5e13f0ae1 100644
--- a/source/gameengine/GameLogic/SCA_PropertyEventManager.h
+++ b/source/gameengine/GameLogic/SCA_PropertyEventManager.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_PROPERTYEVENTMANAGER
-#define __KX_PROPERTYEVENTMANAGER
+#ifndef __SCA_PROPERTYEVENTMANAGER_H__
+#define __SCA_PROPERTYEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 
@@ -54,5 +54,5 @@ public:
 #endif
 };
 
-#endif //__KX_PROPERTYEVENTMANAGER
+#endif //__SCA_PROPERTYEVENTMANAGER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.h b/source/gameengine/GameLogic/SCA_PropertySensor.h
index bf7b1e879f7..ca942076efa 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.h
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.h
@@ -30,8 +30,8 @@
  *  \brief Property sensor
  */
 
-#ifndef __KX_PROPERTYSENSOR
-#define __KX_PROPERTYSENSOR
+#ifndef __SCA_PROPERTYSENSOR_H__
+#define __SCA_PROPERTYSENSOR_H__
 
 #include "SCA_ISensor.h"
 
diff --git a/source/gameengine/GameLogic/SCA_PythonController.h b/source/gameengine/GameLogic/SCA_PythonController.h
index 521a676bf4a..ccdb82aa722 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.h
+++ b/source/gameengine/GameLogic/SCA_PythonController.h
@@ -30,8 +30,8 @@
  *  \brief Execute Python scripts
  */
 
-#ifndef KX_PYTHONCONTROLLER_H
-#define KX_PYTHONCONTROLLER_H
+#ifndef __SCA_PYTHONCONTROLLER_H__
+#define __SCA_PYTHONCONTROLLER_H__
 
 #include "SCA_IController.h"
 #include "SCA_LogicManager.h"
@@ -115,5 +115,5 @@ class SCA_PythonController : public SCA_IController
 #endif
 };
 
-#endif //KX_PYTHONCONTROLLER_H
+#endif //__SCA_PYTHONCONTROLLER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_PythonKeyboard.h b/source/gameengine/GameLogic/SCA_PythonKeyboard.h
index f44bb40e13c..df5e46f8c28 100644
--- a/source/gameengine/GameLogic/SCA_PythonKeyboard.h
+++ b/source/gameengine/GameLogic/SCA_PythonKeyboard.h
@@ -24,8 +24,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_PYKEYBOARD
-#define __KX_PYKEYBOARD
+#ifndef __SCA_PYTHONKEYBOARD_H__
+#define __SCA_PYTHONKEYBOARD_H__
 
 #include "PyObjectPlus.h"
 
@@ -47,5 +47,5 @@ public:
 #endif
 };
 
-#endif //__KX_PYKEYBOARD
+#endif //__SCA_PYTHONKEYBOARD_H__
 
diff --git a/source/gameengine/GameLogic/SCA_PythonMouse.h b/source/gameengine/GameLogic/SCA_PythonMouse.h
index 41d286a8048..1313d55005f 100644
--- a/source/gameengine/GameLogic/SCA_PythonMouse.h
+++ b/source/gameengine/GameLogic/SCA_PythonMouse.h
@@ -24,8 +24,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_PYMOUSE
-#define __KX_PYMOUSE
+#ifndef __SCA_PYTHONMOUSE_H__
+#define __SCA_PYTHONMOUSE_H__
 
 #include "PyObjectPlus.h"
 
@@ -56,5 +56,5 @@ public:
 #endif
 };
 
-#endif //__KX_PYMOUSE
+#endif //__SCA_PYTHONMOUSE_H__
 
diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.h b/source/gameengine/GameLogic/SCA_RandomActuator.h
index c439b445a5b..522663651e0 100644
--- a/source/gameengine/GameLogic/SCA_RandomActuator.h
+++ b/source/gameengine/GameLogic/SCA_RandomActuator.h
@@ -30,8 +30,8 @@
  *  \brief Draw a random number, and put it in a property
  */
 
-#ifndef __KX_RANDOMACTUATOR
-#define __KX_RANDOMACTUATOR
+#ifndef __SCA_RANDOMACTUATOR_H__
+#define __SCA_RANDOMACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_RandomNumberGenerator.h"
diff --git a/source/gameengine/GameLogic/SCA_RandomEventManager.h b/source/gameengine/GameLogic/SCA_RandomEventManager.h
index 31e08776603..7205363a3ee 100644
--- a/source/gameengine/GameLogic/SCA_RandomEventManager.h
+++ b/source/gameengine/GameLogic/SCA_RandomEventManager.h
@@ -30,8 +30,8 @@
  *  \brief Manager for random events
  */
 
-#ifndef __KX_RANDOMEVENTMGR
-#define __KX_RANDOMEVENTMGR
+#ifndef __SCA_RANDOMEVENTMANAGER_H__
+#define __SCA_RANDOMEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 #include <vector>
@@ -53,5 +53,5 @@ public:
 #endif
 };
 
-#endif //__KX_RANDOMEVENTMGR
+#endif //__SCA_RANDOMEVENTMANAGER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
index 87461b1a783..a935db94020 100644
--- a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
+++ b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
@@ -32,8 +32,8 @@
  * on a per-generator basis.
  */
 
-#ifndef __KX_RANDOMNUMBERGENERATOR
-#define __KX_RANDOMNUMBERGENERATOR
+#ifndef __SCA_RANDOMNUMBERGENERATOR_H__
+#define __SCA_RANDOMNUMBERGENERATOR_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -83,5 +83,5 @@ public:
 #endif
 };
 
-#endif /* __KX_RANDOMNUMBERGENERATOR */
+#endif /* __SCA_RANDOMNUMBERGENERATOR_H__ */
 
diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.h b/source/gameengine/GameLogic/SCA_RandomSensor.h
index cec8bcdb445..008445ef878 100644
--- a/source/gameengine/GameLogic/SCA_RandomSensor.h
+++ b/source/gameengine/GameLogic/SCA_RandomSensor.h
@@ -30,8 +30,8 @@
  *  \brief Generate random pulses
  */
 
-#ifndef __KX_RANDOMSENSOR
-#define __KX_RANDOMSENSOR
+#ifndef __SCA_RANDOMSENSOR_H__
+#define __SCA_RANDOMSENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "BoolValue.h"
@@ -68,5 +68,5 @@ public:
 #endif
 };
 
-#endif //__KX_RANDOMSENSOR
+#endif //__SCA_RANDOMSENSOR_H__
 
diff --git a/source/gameengine/GameLogic/SCA_TimeEventManager.h b/source/gameengine/GameLogic/SCA_TimeEventManager.h
index cac52fb2de5..7c813785b9c 100644
--- a/source/gameengine/GameLogic/SCA_TimeEventManager.h
+++ b/source/gameengine/GameLogic/SCA_TimeEventManager.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_TIMEEVENTMANAGER
-#define __KX_TIMEEVENTMANAGER
+#ifndef __SCA_TIMEEVENTMANAGER_H__
+#define __SCA_TIMEEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 #include "Value.h"
@@ -61,5 +61,5 @@ public:
 #endif
 };
 
-#endif //__KX_TIMEEVENTMANAGER
+#endif //__SCA_TIMEEVENTMANAGER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_XNORController.h b/source/gameengine/GameLogic/SCA_XNORController.h
index c2cdad2cdf4..5ef4dc67cf2 100644
--- a/source/gameengine/GameLogic/SCA_XNORController.h
+++ b/source/gameengine/GameLogic/SCA_XNORController.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_XNORCONTROLLER
-#define __KX_XNORCONTROLLER
+#ifndef __SCA_XNORCONTROLLER_H__
+#define __SCA_XNORCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -50,5 +50,5 @@ public:
 
 };
 
-#endif //__KX_XNORCONTROLLER
+#endif //__SCA_XNORCONTROLLER_H__
 
diff --git a/source/gameengine/GameLogic/SCA_XORController.h b/source/gameengine/GameLogic/SCA_XORController.h
index 1f38a510046..56cd2440863 100644
--- a/source/gameengine/GameLogic/SCA_XORController.h
+++ b/source/gameengine/GameLogic/SCA_XORController.h
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_XORCONTROLLER
-#define __KX_XORCONTROLLER
+#ifndef __SCA_XORCONTROLLER_H__
+#define __SCA_XORCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -45,5 +45,5 @@ public:
 	virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__KX_XORCONTROLLER
+#endif //__SCA_XORCONTROLLER_H__
 
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h
index a9d7ab1b93f..e865c662eda 100644
--- a/source/gameengine/GamePlayer/common/GPC_Canvas.h
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef _GPC_CANVAS_H_
-#define _GPC_CANVAS_H_
+#ifndef __GPC_CANVAS_H__
+#define __GPC_CANVAS_H__
 
 #include "RAS_ICanvas.h"
 #include "RAS_Rect.h"
@@ -270,5 +270,5 @@ protected:
 	static TBannerId s_bannerId;
 };
 
-#endif // _GPC_CANVAS_H_
+#endif // __GPC_CANVAS_H__
 
diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.h b/source/gameengine/GamePlayer/common/GPC_Engine.h
index 70e5a3ee631..095efee7895 100644
--- a/source/gameengine/GamePlayer/common/GPC_Engine.h
+++ b/source/gameengine/GamePlayer/common/GPC_Engine.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_ENGINE_H
-#define __GPC_ENGINE_H
+#ifndef __GPC_ENGINE_H__
+#define __GPC_ENGINE_H__
 
 #include "GPC_Canvas.h"
 #include "GPC_System.h"
@@ -121,5 +121,5 @@ private:
 
 };
 
-#endif  // __GPC_ENGINE_H
+#endif  // __GPC_ENGINE_H__
 
diff --git a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
index 3d88dc467b0..ba4213b190c 100644
--- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
+++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_KEYBOARDDEVICE_H
-#define __GPC_KEYBOARDDEVICE_H
+#ifndef __GPC_KEYBOARDDEVICE_H__
+#define __GPC_KEYBOARDDEVICE_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
diff --git a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
index a4f0032df1d..c5576d1d234 100644
--- a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
+++ b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_MOUSE_DEVICE_H
-#define __GPC_MOUSE_DEVICE_H
+#ifndef __GPC_MOUSEDEVICE_H__
+#define __GPC_MOUSEDEVICE_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
@@ -102,5 +102,5 @@ protected:
 	virtual bool ConvertEvent(KX_EnumInputs kxevent, int eventval);
 };
 
-#endif  // __GPC_MOUSE_DEVICE_H
+#endif  // __GPC_MOUSEDEVICE_H__
 
diff --git a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
index 9b27ba3f009..6f15276ab83 100644
--- a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
+++ b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
@@ -29,10 +29,10 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_RAWLOADDOTBLENDARRAY_H
-#define __GPC_RAWLOADDOTBLENDARRAY_H
+#ifndef __GPC_RAWLOADDOTBLENDARRAY_H__
+#define __GPC_RAWLOADDOTBLENDARRAY_H__
 
 void GetRawLoadingAnimation(unsigned char **data, int *dataSize);
 
-#endif  // __GPC_RAWLOADDOTBLENDARRAY_H
+#endif  // __GPC_RAWLOADDOTBLENDARRAY_H__
 
diff --git a/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h b/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
index 43bd6d22190..ade00020353 100644
--- a/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
+++ b/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_RAWLOGOARRAYS_H
-#define __GPC_RAWLOGOARRAYS_H
+#ifndef __GPC_RAWLOGOARRAYS_H__
+#define __GPC_RAWLOGOARRAYS_H__
 
 void GetRawBlenderLogo(unsigned char **data, int *width, int *height);
 void GetRawBlender3DLogo(unsigned char **data, int *width, int *height);
@@ -38,5 +38,5 @@ void GetRawBlender3DLogo(unsigned char **data, int *width, int *height);
 void GetRawNaNLogo(unsigned char **data, int *width, int *height);
 #endif
 
-#endif  // __GPC_RAWLOGOARRAYS_H
+#endif  // __GPC_RAWLOGOARRAYS_H__
 
diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
index e3c69029700..54bf45fc74b 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_RENDERTOOLS_H
-#define __GPC_RENDERTOOLS_H
+#ifndef __GPC_RENDERTOOLS_H__
+#define __GPC_RENDERTOOLS_H__
 
 #ifdef WIN32
 // don't show stl-warnings
@@ -106,7 +106,7 @@ public:
 	virtual void SetClientObject(RAS_IRasterizer *rasty, void* obj);
 };
 
-#endif  // __GPC_RENDERTOOLS_H
+#endif  // __GPC_RENDERTOOLS_H__
 
 
 
diff --git a/source/gameengine/GamePlayer/common/GPC_System.h b/source/gameengine/GamePlayer/common/GPC_System.h
index 9f7a56aa783..03bb7743637 100644
--- a/source/gameengine/GamePlayer/common/GPC_System.h
+++ b/source/gameengine/GamePlayer/common/GPC_System.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_SYSTEM_H
-#define __GPC_SYSTEM_H
+#ifndef __GPC_SYSTEM_H__
+#define __GPC_SYSTEM_H__
 
 #if defined(WIN32)
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@@ -59,5 +59,5 @@ public:
 //	NG_NetworkDeviceInterface* m_ndi;
 };
 
-#endif  // __GPC_SYSTEM_H
+#endif  // __GPC_SYSTEM_H__
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
index 217cfc5eb88..e96cd50b9f4 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef _GPG_CANVAS_H_
-#define _GPG_CANVAS_H_
+#ifndef __GPG_CANVAS_H__
+#define __GPG_CANVAS_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
@@ -66,5 +66,5 @@ public:
 	void EndDraw() {};
 };
 
-#endif // _GPG_CANVAS_H_
+#endif // __GPG_CANVAS_H__
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
index 2c7ba86e438..57fd0694ec0 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
@@ -30,8 +30,8 @@
  *  \brief GHOST Blender Player keyboard device.
  */
 
-#ifndef _GPG_KEYBOARDDEVICE_H_
-#define _GPG_KEYBOARDDEVICE_H_
+#ifndef __GPG_KEYBOARDDEVICE_H__
+#define __GPG_KEYBOARDDEVICE_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
@@ -53,5 +53,5 @@ public:
 	virtual ~GPG_KeyboardDevice(void);
 };
 
-#endif //_GPG_KEYBOARDDEVICE_H_
+#endif //__GPG_KEYBOARDDEVICE_H__
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_System.h b/source/gameengine/GamePlayer/ghost/GPG_System.h
index d7f3093d8b0..796ad0c2b8c 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_System.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_System.h
@@ -30,8 +30,8 @@
  *  \brief Blender Player system on GHOST.
  */
 
-#ifndef _GPG_SYSTEM_H_
-#define _GPG_SYSTEM_H_
+#ifndef __GPG_SYSTEM_H__
+#define __GPG_SYSTEM_H__
 
 #ifdef WIN32
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@@ -51,5 +51,5 @@ public:
 	virtual double GetTimeInSeconds();
 };
 
-#endif // _GPG_SYSTEM_H_
+#endif // __GPG_SYSTEM_H__
 
diff --git a/source/gameengine/Ketsji/BL_Action.h b/source/gameengine/Ketsji/BL_Action.h
index 3efea0576fd..e5e325a2ba0 100644
--- a/source/gameengine/Ketsji/BL_Action.h
+++ b/source/gameengine/Ketsji/BL_Action.h
@@ -24,8 +24,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __BL_ACTION
-#define __BL_ACTION
+#ifndef __BL_ACTION_H__
+#define __BL_ACTION_H__
 
 
 #include <vector>
diff --git a/source/gameengine/Ketsji/BL_ActionManager.h b/source/gameengine/Ketsji/BL_ActionManager.h
index 2ba84863f95..d4351e3c704 100644
--- a/source/gameengine/Ketsji/BL_ActionManager.h
+++ b/source/gameengine/Ketsji/BL_ActionManager.h
@@ -24,8 +24,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __BL_ACTIONMANAGER
-#define __BL_ACTIONMANAGER
+#ifndef __BL_ACTIONMANAGER_H__
+#define __BL_ACTIONMANAGER_H__
 
 #include "BL_Action.h"
 
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h
index 1331899a6b2..d309b1236fc 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.h
+++ b/source/gameengine/Ketsji/BL_BlenderShader.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __BL_GPUSHADER_H__
-#define __BL_GPUSHADER_H__
+#ifndef __BL_BLENDERSHADER_H__
+#define __BL_BLENDERSHADER_H__
 
 #include "GPU_material.h"
 
@@ -103,4 +103,4 @@ public:
 #endif
 };
 
-#endif//__BL_GPUSHADER_H__
+#endif//__BL_BLENDERSHADER_H__
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
index d14d3600b48..4f560428fbb 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
@@ -30,8 +30,8 @@
  *  \brief Ketsji Logic Extenstion: Network Event Manager class
  */
 
-#ifndef KX_NETWORK_EVENTMANAGER_H
-#define KX_NETWORK_EVENTMANAGER_H
+#ifndef __KX_NETWORKEVENTMANAGER_H__
+#define __KX_NETWORKEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 
@@ -52,5 +52,5 @@ public:
 		return m_ndi; }
 };
 
-#endif //KX_NETWORK_EVENTMANAGER_H
+#endif //__KX_NETWORKEVENTMANAGER_H__
 
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
index f3447356055..3c8d8ec23d2 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
@@ -30,8 +30,8 @@
  *  \brief Ketsji Logic Extenstion: Network Message Actuator class
  */
 
-#ifndef __KX_NETWORKMESSAGEACTUATOR_H
-#define __KX_NETWORKMESSAGEACTUATOR_H
+#ifndef __KX_NETWORKMESSAGEACTUATOR_H__
+#define __KX_NETWORKMESSAGEACTUATOR_H__
 
 #include "STR_String.h"
 #include "SCA_IActuator.h"
@@ -69,5 +69,5 @@ public:
 
 };
 
-#endif //__KX_NETWORKMESSAGEACTUATOR_H
+#endif //__KX_NETWORKMESSAGEACTUATOR_H__
 
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
index 75800d9b9fa..0c76e718fa2 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsjinet
  *  \brief Ketsji Logic Extenstion: Network Message Sensor class
  */
-#ifndef __KX_NETWORKMESSAGE_SENSOR_H
-#define __KX_NETWORKMESSAGE_SENSOR_H
+#ifndef __KX_NETWORKMESSAGESENSOR_H__
+#define __KX_NETWORKMESSAGESENSOR_H__
 
 #include "SCA_ISensor.h"
 
@@ -87,5 +87,5 @@ public:
 
 };
 
-#endif //__KX_NETWORKMESSAGE_SENSOR_H
+#endif //__KX_NETWORKMESSAGESENSOR_H__
 
diff --git a/source/gameengine/Ketsji/KX_ArmatureSensor.h b/source/gameengine/Ketsji/KX_ArmatureSensor.h
index 683a54f65de..9c3faa355a6 100644
--- a/source/gameengine/Ketsji/KX_ArmatureSensor.h
+++ b/source/gameengine/Ketsji/KX_ArmatureSensor.h
@@ -30,8 +30,8 @@
  *  \brief Property sensor
  */
 
-#ifndef __KX_ARMATURESENSOR
-#define __KX_ARMATURESENSOR
+#ifndef __KX_ARMATURESENSOR_H__
+#define __KX_ARMATURESENSOR_H__
 
 struct bConstraint;
 
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h
index 18f9875a804..af6771933eb 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -3,8 +3,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_BLENDER_MATERIAL_H__
-#define __KX_BLENDER_MATERIAL_H__
+#ifndef __KX_BLENDERMATERIAL_H__
+#define __KX_BLENDERMATERIAL_H__
 
 #include <vector>
 
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.h b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
index c0ff143919d..d2f56bccaa0 100644
--- a/source/gameengine/Ketsji/KX_BulletPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
@@ -3,8 +3,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_BULLET2PHYSICS_CONTROLLER
-#define KX_BULLET2PHYSICS_CONTROLLER
+#ifndef __KX_BULLETPHYSICSCONTROLLER_H__
+#define __KX_BULLETPHYSICSCONTROLLER_H__
 
 
 #include "KX_IPhysicsController.h"
@@ -98,5 +98,5 @@ public:
 #endif
 };
 
-#endif //KX_BULLET2PHYSICS_CONTROLLER
+#endif //__KX_BULLETPHYSICSCONTROLLER_H__
 
diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h
index e9c4e99aa3b..2f5fe112de6 100644
--- a/source/gameengine/Ketsji/KX_Camera.h
+++ b/source/gameengine/Ketsji/KX_Camera.h
@@ -30,8 +30,8 @@
  *  \brief Camera in the gameengine. Cameras are also used for views.
  */
 
-#ifndef __KX_CAMERA
-#define __KX_CAMERA
+#ifndef __KX_CAMERA_H__
+#define __KX_CAMERA_H__
 
 
 #include "MT_Transform.h"
@@ -320,5 +320,5 @@ public:
 #endif
 };
 
-#endif //__KX_CAMERA
+#endif //__KX_CAMERA_H__
 
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.h b/source/gameengine/Ketsji/KX_CameraActuator.h
index 1cae676fe3f..eb0a4574a8f 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.h
+++ b/source/gameengine/Ketsji/KX_CameraActuator.h
@@ -32,8 +32,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_CAMERAACTUATOR
-#define __KX_CAMERAACTUATOR
+#ifndef __KX_CAMERAACTUATOR_H__
+#define __KX_CAMERAACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "MT_Scalar.h"
@@ -135,5 +135,5 @@ private :
 
 };
 
-#endif //__KX_CAMERAACTUATOR
+#endif //__KX_CAMERAACTUATOR_H__
 
diff --git a/source/gameengine/Ketsji/KX_CameraIpoSGController.h b/source/gameengine/Ketsji/KX_CameraIpoSGController.h
index fb91455fed4..f24d0942290 100644
--- a/source/gameengine/Ketsji/KX_CameraIpoSGController.h
+++ b/source/gameengine/Ketsji/KX_CameraIpoSGController.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_CAMERAIPOSGCONTROLLER_H
-#define KX_CAMERAIPOSGCONTROLLER_H
+#ifndef __KX_CAMERAIPOSGCONTROLLER_H__
+#define __KX_CAMERAIPOSGCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "SG_Spatial.h"
@@ -96,5 +96,5 @@ public:
 #endif
 };
 
-#endif // KX_CAMERAIPOSGCONTROLLER_H
+#endif // __KX_CAMERAIPOSGCONTROLLER_H__
 
diff --git a/source/gameengine/Ketsji/KX_ClientObjectInfo.h b/source/gameengine/Ketsji/KX_ClientObjectInfo.h
index 78f2f5446d4..1a94c39441f 100644
--- a/source/gameengine/Ketsji/KX_ClientObjectInfo.h
+++ b/source/gameengine/Ketsji/KX_ClientObjectInfo.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_CLIENTOBJECT_INFO_H
-#define __KX_CLIENTOBJECT_INFO_H
+#ifndef __KX_CLIENTOBJECTINFO_H__
+#define __KX_CLIENTOBJECTINFO_H__
 
 /* Note, the way this works with/without sumo is a bit odd */
 
@@ -86,5 +86,5 @@ public:
 #endif
 };
 
-#endif //__KX_CLIENTOBJECT_INFO_H
+#endif //__KX_CLIENTOBJECTINFO_H__
 
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.h b/source/gameengine/Ketsji/KX_ConstraintActuator.h
index b513b141f3e..f491aedba74 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.h
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_CONSTRAINTACTUATOR
-#define __KX_CONSTRAINTACTUATOR
+#ifndef __KX_CONSTRAINTACTUATOR_H__
+#define __KX_CONSTRAINTACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "MT_Scalar.h"
@@ -145,5 +145,5 @@ protected:
 
 };
 
-#endif //__KX_CONSTRAINTACTUATOR
+#endif //__KX_CONSTRAINTACTUATOR_H__
 
diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.h b/source/gameengine/Ketsji/KX_ConstraintWrapper.h
index 980221bd4b3..bd27bc5b333 100644
--- a/source/gameengine/Ketsji/KX_ConstraintWrapper.h
+++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_CONSTRAINT_WRAPPER
-#define KX_CONSTRAINT_WRAPPER
+#ifndef __KX_CONSTRAINTWRAPPER_H__
+#define __KX_CONSTRAINTWRAPPER_H__
 
 #include "Value.h"
 #include "PHY_DynamicTypes.h"
@@ -57,5 +57,5 @@ private:
 	PHY_IPhysicsEnvironment* m_physenv;
 };
 
-#endif //KX_CONSTRAINT_WRAPPER
+#endif //__KX_CONSTRAINTWRAPPER_H__
 
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
index 9471d58bada..f1f58d7da9a 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_CONVERTPHYSICSOBJECTS
-#define KX_CONVERTPHYSICSOBJECTS
+#ifndef __KX_CONVERTPHYSICSOBJECT_H__
+#define __KX_CONVERTPHYSICSOBJECT_H__
 
 class RAS_MeshObject;
 class KX_Scene;
@@ -158,4 +158,4 @@ void	KX_ClearBulletSharedShapes();
 bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *from_gameobj, RAS_MeshObject* from_meshobj);
 
 #endif
-#endif //KX_CONVERTPHYSICSOBJECTS
+#endif //__KX_CONVERTPHYSICSOBJECT_H__
diff --git a/source/gameengine/Ketsji/KX_EmptyObject.h b/source/gameengine/Ketsji/KX_EmptyObject.h
index 845a37fa04a..7ad9984888d 100644
--- a/source/gameengine/Ketsji/KX_EmptyObject.h
+++ b/source/gameengine/Ketsji/KX_EmptyObject.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_EMPTYOBJECT
-#define  __KX_EMPTYOBJECT
+#ifndef __KX_EMPTYOBJECT_H__
+#define  __KX_EMPTYOBJECT_H__
 #include "KX_GameObject.h"
 
 class KX_EmptyObject : public KX_GameObject
@@ -49,5 +49,5 @@ public:
 #endif
 };
 
-#endif //__KX_EMPTYOBJECT
+#endif //__KX_EMPTYOBJECT_H__
 
diff --git a/source/gameengine/Ketsji/KX_FontObject.h b/source/gameengine/Ketsji/KX_FontObject.h
index 958a6cd3360..2466a32dad4 100644
--- a/source/gameengine/Ketsji/KX_FontObject.h
+++ b/source/gameengine/Ketsji/KX_FontObject.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_FONTOBJECT
-#define  __KX_FONTOBJECT
+#ifndef __KX_FONTOBJECT_H__
+#define  __KX_FONTOBJECT_H__
 #include "KX_GameObject.h"
 #include "DNA_vfont_types.h"
 #include "RAS_IRenderTools.h"
@@ -84,4 +84,4 @@ public:
 
 };
 
-#endif //__KX_FONTOBJECT
+#endif //__KX_FONTOBJECT_H__
diff --git a/source/gameengine/Ketsji/KX_GameActuator.h b/source/gameengine/Ketsji/KX_GameActuator.h
index ebc6712a2dd..8356bc1068b 100644
--- a/source/gameengine/Ketsji/KX_GameActuator.h
+++ b/source/gameengine/Ketsji/KX_GameActuator.h
@@ -30,8 +30,8 @@
  *  \brief actuator for global game stuff
  */
 
-#ifndef __KX_GAMEACTUATOR
-#define __KX_GAMEACTUATOR
+#ifndef __KX_GAMEACTUATOR_H__
+#define __KX_GAMEACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index a35e6f1b2cd..895140528e8 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -30,8 +30,8 @@
  *  \brief General KX game object.
  */
 
-#ifndef __KX_GAMEOBJECT
-#define __KX_GAMEOBJECT
+#ifndef __KX_GAMEOBJECT_H__
+#define __KX_GAMEOBJECT_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 // get rid of this stupid "warning 'this' used in initialiser list", generated by VC when including Solid/Sumo
@@ -1008,5 +1008,5 @@ public:
 
 
 
-#endif //__KX_GAMEOBJECT
+#endif //__KX_GAMEOBJECT_H__
 
diff --git a/source/gameengine/Ketsji/KX_IInterpolator.h b/source/gameengine/Ketsji/KX_IInterpolator.h
index ed843962bd0..2e30d77f8e5 100644
--- a/source/gameengine/Ketsji/KX_IInterpolator.h
+++ b/source/gameengine/Ketsji/KX_IInterpolator.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_IINTERPOLATOR_H
-#define KX_IINTERPOLATOR_H
+#ifndef __KX_IINTERPOLATOR_H__
+#define __KX_IINTERPOLATOR_H__
 
 #include <vector>
 
diff --git a/source/gameengine/Ketsji/KX_IPOTransform.h b/source/gameengine/Ketsji/KX_IPOTransform.h
index c028b4c49d2..43019f3e54a 100644
--- a/source/gameengine/Ketsji/KX_IPOTransform.h
+++ b/source/gameengine/Ketsji/KX_IPOTransform.h
@@ -30,8 +30,8 @@
  *  \brief An abstract object you can move around in a 3d world, and has some logic
  */
 
-#ifndef KX_IPOTRANSFORM_H
-#define KX_IPOTRANSFORM_H
+#ifndef __KX_IPOTRANSFORM_H__
+#define __KX_IPOTRANSFORM_H__
 
 #include "MT_Transform.h"
 
diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.h b/source/gameengine/Ketsji/KX_IPO_SGController.h
index f7e57014839..3abcaa3a39e 100644
--- a/source/gameengine/Ketsji/KX_IPO_SGController.h
+++ b/source/gameengine/Ketsji/KX_IPO_SGController.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __IPO_SGCONTROLLER_H
-#define __IPO_SGCONTROLLER_H
+#ifndef __KX_IPO_SGCONTROLLER_H__
+#define __KX_IPO_SGCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "SG_Spatial.h"
@@ -127,6 +127,6 @@ public:
 #endif
 };
 
-#endif //__IPO_SGCONTROLLER_H
+#endif //__KX_IPO_SGCONTROLLER_H__
 
 
diff --git a/source/gameengine/Ketsji/KX_IPhysicsController.h b/source/gameengine/Ketsji/KX_IPhysicsController.h
index 2d08ef3a0da..5fc9f5c2473 100644
--- a/source/gameengine/Ketsji/KX_IPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_IPhysicsController.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_IPHYSICSCONTROLLER_H
-#define __KX_IPHYSICSCONTROLLER_H
+#ifndef __KX_IPHYSICSCONTROLLER_H__
+#define __KX_IPHYSICSCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "MT_Vector3.h"
@@ -138,5 +138,5 @@ public:
 #endif
 };
 
-#endif //__KX_IPHYSICSCONTROLLER_H
+#endif //__KX_IPHYSICSCONTROLLER_H__
 
diff --git a/source/gameengine/Ketsji/KX_IScalarInterpolator.h b/source/gameengine/Ketsji/KX_IScalarInterpolator.h
index 0ac765abb4f..72842f311c9 100644
--- a/source/gameengine/Ketsji/KX_IScalarInterpolator.h
+++ b/source/gameengine/Ketsji/KX_IScalarInterpolator.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_ISCALARINTERPOLATOR_H
-#define KX_ISCALARINTERPOLATOR_H
+#ifndef __KX_ISCALARINTERPOLATOR_H__
+#define __KX_ISCALARINTERPOLATOR_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h
index 5afdaa971bc..dce97ea039f 100644
--- a/source/gameengine/Ketsji/KX_ISceneConverter.h
+++ b/source/gameengine/Ketsji/KX_ISceneConverter.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_ISCENECONVERTER_H
-#define __KX_ISCENECONVERTER_H
+#ifndef __KX_ISCENECONVERTER_H__
+#define __KX_ISCENECONVERTER_H__
 
 #include "STR_String.h"
 #include "KX_Python.h"
@@ -95,5 +95,5 @@ public:
 #endif
 };
 
-#endif //__KX_ISCENECONVERTER_H
+#endif //__KX_ISCENECONVERTER_H__
 
diff --git a/source/gameengine/Ketsji/KX_ISystem.h b/source/gameengine/Ketsji/KX_ISystem.h
index d0a51490e28..4a6f7223d0a 100644
--- a/source/gameengine/Ketsji/KX_ISystem.h
+++ b/source/gameengine/Ketsji/KX_ISystem.h
@@ -30,8 +30,8 @@
  *  \brief Abstract system
  */
 
-#ifndef __KX_ISYSTEM
-#define __KX_ISYSTEM
+#ifndef __KX_ISYSTEM_H__
+#define __KX_ISYSTEM_H__
 
 #include <vector>
 using namespace std;
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h
index 6b172ba8603..a8b7a362bd9 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.h
+++ b/source/gameengine/Ketsji/KX_IpoActuator.h
@@ -30,8 +30,8 @@
  *  \brief Do an object ipo
  */
 
-#ifndef __KX_IPOACTUATOR
-#define __KX_IPOACTUATOR
+#ifndef __KX_IPOACTUATOR_H__
+#define __KX_IPOACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
@@ -150,5 +150,5 @@ public:
 	
 };
 
-#endif //__KX_IPOACTUATOR
+#endif //__KX_IPOACTUATOR_H__
 
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index 96b737b686d..ab3126d90a0 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -30,8 +30,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_KETSJI_ENGINE
-#define __KX_KETSJI_ENGINE
+#ifndef __KX_KETSJIENGINE_H__
+#define __KX_KETSJIENGINE_H__
 
 #include "MT_CmMatrix4x4.h"
 #include "MT_Matrix4x4.h"
@@ -450,6 +450,6 @@ public:
 #endif
 };
 
-#endif //__KX_KETSJI_ENGINE
+#endif //__KX_KETSJIENGINE_H__
 
 
diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h
index bb081e6a444..c2815e7afaa 100644
--- a/source/gameengine/Ketsji/KX_Light.h
+++ b/source/gameengine/Ketsji/KX_Light.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_LIGHT
-#define __KX_LIGHT
+#ifndef __KX_LIGHT_H__
+#define __KX_LIGHT_H__
 
 #include "RAS_LightObject.h"
 #include "KX_GameObject.h"
@@ -82,5 +82,5 @@ public:
 #endif
 };
 
-#endif //__KX_LIGHT
+#endif //__KX_LIGHT_H__
 
diff --git a/source/gameengine/Ketsji/KX_LightIpoSGController.h b/source/gameengine/Ketsji/KX_LightIpoSGController.h
index 61618c20183..78466e822e7 100644
--- a/source/gameengine/Ketsji/KX_LightIpoSGController.h
+++ b/source/gameengine/Ketsji/KX_LightIpoSGController.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_LIGHTIPOSGCONTROLLER_H
-#define KX_LIGHTIPOSGCONTROLLER_H
+#ifndef __KX_LIGHTIPOSGCONTROLLER_H__
+#define __KX_LIGHTIPOSGCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "SG_Spatial.h"
@@ -104,5 +104,5 @@ public:
 #endif
 };
 
-#endif // KX_LIGHTIPOSGCONTROLLER_H
+#endif // __KX_LIGHTIPOSGCONTROLLER_H__
 
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.h b/source/gameengine/Ketsji/KX_MeshProxy.h
index f59418a5de2..dfaf1eba009 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.h
+++ b/source/gameengine/Ketsji/KX_MeshProxy.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_MESHPROXY
-#define __KX_MESHPROXY
+#ifndef __KX_MESHPROXY_H__
+#define __KX_MESHPROXY_H__
 
 #ifdef WITH_PYTHON
 
@@ -79,5 +79,5 @@ public:
 
 #endif // WITH_PYTHON
 
-#endif //__KX_MESHPROXY
+#endif //__KX_MESHPROXY_H__
 
diff --git a/source/gameengine/Ketsji/KX_MotionState.h b/source/gameengine/Ketsji/KX_MotionState.h
index b18a745ad92..02470f88c5e 100644
--- a/source/gameengine/Ketsji/KX_MotionState.h
+++ b/source/gameengine/Ketsji/KX_MotionState.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_MOTIONSTATE
-#define __KX_MOTIONSTATE
+#ifndef __KX_MOTIONSTATE_H__
+#define __KX_MOTIONSTATE_H__
 
 #include "PHY_IMotionState.h"
 
@@ -63,5 +63,5 @@ public:
 #endif
 };
 
-#endif //__KX_MOTIONSTATE
+#endif //__KX_MOTIONSTATE_H__
 
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
index 43bf6bc5302..a4c15fe0968 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
@@ -30,8 +30,8 @@
  *  \brief KX_MouseFocusSensor determines mouse in/out/over events.
  */
 
-#ifndef __KX_MOUSEFOCUSSENSOR
-#define __KX_MOUSEFOCUSSENSOR
+#ifndef __KX_MOUSEFOCUSSENSOR_H__
+#define __KX_MOUSEFOCUSSENSOR_H__
 
 #include "SCA_MouseSensor.h"
 
diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.h b/source/gameengine/Ketsji/KX_NavMeshObject.h
index ad128a0891d..b9c1fcc66db 100644
--- a/source/gameengine/Ketsji/KX_NavMeshObject.h
+++ b/source/gameengine/Ketsji/KX_NavMeshObject.h
@@ -24,8 +24,8 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
-#ifndef __KX_NAVMESHOBJECT
-#define __KX_NAVMESHOBJECT
+#ifndef __KX_NAVMESHOBJECT_H__
+#define __KX_NAVMESHOBJECT_H__
 #include "DetourStatNavMesh.h"
 #include "KX_GameObject.h"
 #include "PyObjectPlus.h"
@@ -77,5 +77,5 @@ public:
 #endif
 };
 
-#endif //__KX_NAVMESHOBJECT
+#endif //__KX_NAVMESHOBJECT_H__
 
diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h
index a81d621e8fc..ffe077b9738 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.h
+++ b/source/gameengine/Ketsji/KX_NearSensor.h
@@ -30,8 +30,8 @@
  *  \brief Sense if other objects are near
  */
 
-#ifndef KX_NEARSENSOR_H
-#define KX_NEARSENSOR_H
+#ifndef __KX_NEARSENSOR_H__
+#define __KX_NEARSENSOR_H__
 
 #include "KX_TouchSensor.h"
 #include "KX_ClientObjectInfo.h"
@@ -104,5 +104,5 @@ public:
 
 };
 
-#endif //KX_NEARSENSOR_H
+#endif //__KX_NEARSENSOR_H__
 
diff --git a/source/gameengine/Ketsji/KX_ObColorIpoSGController.h b/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
index 230ef93905b..d2d69d6db12 100644
--- a/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
+++ b/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_OBCOLORIPOSGCONTROLLER_H
-#define KX_OBCOLORIPOSGCONTROLLER_H
+#ifndef __KX_OBCOLORIPOSGCONTROLLER_H__
+#define __KX_OBCOLORIPOSGCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "SG_Spatial.h"
@@ -79,5 +79,5 @@ public:
 #endif
 };
 
-#endif // KX_OBCOLORIPOSGCONTROLLER_H
+#endif // __KX_OBCOLORIPOSGCONTROLLER_H__
 
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.h b/source/gameengine/Ketsji/KX_ObjectActuator.h
index aa0f844eb88..397234488b7 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.h
@@ -30,8 +30,8 @@
  *  \brief Do translation/rotation actions
  */
 
-#ifndef __KX_OBJECTACTUATOR
-#define __KX_OBJECTACTUATOR
+#ifndef __KX_OBJECTACTUATOR_H__
+#define __KX_OBJECTACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "MT_Vector3.h"
@@ -222,5 +222,5 @@ public:
 
 };
 
-#endif //__KX_OBJECTACTUATOR
+#endif //__KX_OBJECTACTUATOR_H__
 
diff --git a/source/gameengine/Ketsji/KX_ObstacleSimulation.h b/source/gameengine/Ketsji/KX_ObstacleSimulation.h
index f429d7480c9..d9bda34f112 100644
--- a/source/gameengine/Ketsji/KX_ObstacleSimulation.h
+++ b/source/gameengine/Ketsji/KX_ObstacleSimulation.h
@@ -23,8 +23,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __KX_OBSTACLESIMULATION
-#define __KX_OBSTACLESIMULATION
+#ifndef __KX_OBSTACLESIMULATION_H__
+#define __KX_OBSTACLESIMULATION_H__
 
 #include <vector>
 #include "MT_Point2.h"
diff --git a/source/gameengine/Ketsji/KX_OrientationInterpolator.h b/source/gameengine/Ketsji/KX_OrientationInterpolator.h
index c9aacbafae2..1a4ed534d16 100644
--- a/source/gameengine/Ketsji/KX_OrientationInterpolator.h
+++ b/source/gameengine/Ketsji/KX_OrientationInterpolator.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_ORIENTATIONINTERPOLATOR
-#define KX_ORIENTATIONINTERPOLATOR
+#ifndef __KX_ORIENTATIONINTERPOLATOR_H__
+#define __KX_ORIENTATIONINTERPOLATOR_H__
 
 #include "KX_IInterpolator.h"
 
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.h b/source/gameengine/Ketsji/KX_ParentActuator.h
index d9509894748..6191b889da3 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.h
+++ b/source/gameengine/Ketsji/KX_ParentActuator.h
@@ -30,8 +30,8 @@
  *  \brief Set or remove an objects parent
  */
 
-#ifndef __KX_PARENTACTUATOR
-#define __KX_PARENTACTUATOR
+#ifndef __KX_PARENTACTUATOR_H__
+#define __KX_PARENTACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_LogicManager.h"
diff --git a/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h b/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
index 11474c678af..f20bab578d1 100644
--- a/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
+++ b/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_PHYSICSENGINEENUMS
-#define __KX_PHYSICSENGINEENUMS
+#ifndef __KX_PHYSICSENGINEENUMS_H__
+#define __KX_PHYSICSENGINEENUMS_H__
 
 enum	e_PhysicsEngine
 {
@@ -43,5 +43,5 @@ enum	e_PhysicsEngine
 		UseBullet	=	5,
 };
 
-#endif //__KX_PHYSICSENGINEENUMS
+#endif //__KX_PHYSICSENGINEENUMS_H__
 
diff --git a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
index 4f03c8fbfb1..a074ff9a3bd 100644
--- a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
+++ b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef PHYP_PHYSICSOBJECT_WRAPPER
-#define PHYP_PHYSICSOBJECT_WRAPPER
+#ifndef __KX_PHYSICSOBJECTWRAPPER_H__
+#define __KX_PHYSICSOBJECTWRAPPER_H__
 
 #include "Value.h"
 #include "PHY_DynamicTypes.h"
@@ -56,5 +56,5 @@ private:
 	PHY_IPhysicsEnvironment* m_physenv;
 };
 
-#endif //PHYP_PHYSICSOBJECT_WRAPPER
+#endif //__KX_PHYSICSOBJECTWRAPPER_H__
 
diff --git a/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h b/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
index bb2fb08644c..86ba2500763 100644
--- a/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
+++ b/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
@@ -30,8 +30,8 @@
  *  \todo check if this file is still needed
  */
 
-#ifndef KX_PROPSH
-#define KX_PROPSH
+#ifndef __KX_PHYSICSPROPERTIESOBSOLETE_H__
+#define __KX_PHYSICSPROPERTIESOBSOLETE_H__
 
 #include <MT_Scalar.h>
 
@@ -58,5 +58,5 @@ struct KX_MaterialProps {
 	bool      m_fh_normal;             // Should the object slide off slopes?
 };
 
-#endif //KX_PROPSH
+#endif //__KX_PHYSICSPROPERTIESOBSOLETE_H__
 
diff --git a/source/gameengine/Ketsji/KX_PositionInterpolator.h b/source/gameengine/Ketsji/KX_PositionInterpolator.h
index 88124cfd085..ef5dfc8ac6b 100644
--- a/source/gameengine/Ketsji/KX_PositionInterpolator.h
+++ b/source/gameengine/Ketsji/KX_PositionInterpolator.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_POSITIONINTERPOLATOR
-#define KX_POSITIONINTERPOLATOR
+#ifndef __KX_POSITIONINTERPOLATOR_H__
+#define __KX_POSITIONINTERPOLATOR_H__
 
 #include "KX_IInterpolator.h"
 
diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.h b/source/gameengine/Ketsji/KX_PyConstraintBinding.h
index a5846d91a5c..2c98e6347da 100644
--- a/source/gameengine/Ketsji/KX_PyConstraintBinding.h
+++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef PHY_PYTHON_CONSTRAINTBINDING
-#define PHY_PYTHON_CONSTRAINTBINDING
+#ifndef __KX_PYCONSTRAINTBINDING_H__
+#define __KX_PYCONSTRAINTBINDING_H__
 
 #ifdef WITH_PYTHON
 
@@ -42,5 +42,5 @@ void	PHY_SetActiveEnvironment(class	PHY_IPhysicsEnvironment* env);
 PHY_IPhysicsEnvironment*	PHY_GetActiveEnvironment();
 #endif // WITH_PYTHON
 
-#endif //PHY_PYTHON_CONSTRAINTBINDING
+#endif //__KX_PYCONSTRAINTBINDING_H__
 
diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h
index 40d2d38a465..d8346018b55 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.h
+++ b/source/gameengine/Ketsji/KX_PythonInit.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_PYTHON_INIT
-#define __KX_PYTHON_INIT
+#ifndef __KX_PYTHONINIT_H__
+#define __KX_PYTHONINIT_H__
 
 #include "KX_Python.h"
 #include "STR_String.h"
@@ -74,5 +74,5 @@ void		KX_RasterizerDrawDebugCircle(const MT_Vector3& center, const MT_Scalar rad
 										 const MT_Vector3& normal, int nsector);
 
 
-#endif //__KX_PYTHON_INIT
+#endif //__KX_PYTHONINIT_H__
 
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.h b/source/gameengine/Ketsji/KX_RadarSensor.h
index ee803d9bdb9..f647189ab35 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.h
+++ b/source/gameengine/Ketsji/KX_RadarSensor.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_RADAR_SENSOR_H
-#define __KX_RADAR_SENSOR_H
+#ifndef __KX_RADARSENSOR_H__
+#define __KX_RADARSENSOR_H__
 
 #include "KX_NearSensor.h"
 #include "MT_Point3.h"
@@ -95,5 +95,5 @@ public:
 
 };
 
-#endif //__KX_RADAR_SENSOR_H
+#endif //__KX_RADARSENSOR_H__
 
diff --git a/source/gameengine/Ketsji/KX_RayEventManager.h b/source/gameengine/Ketsji/KX_RayEventManager.h
index 0b1e525eccf..fee2fe53227 100644
--- a/source/gameengine/Ketsji/KX_RayEventManager.h
+++ b/source/gameengine/Ketsji/KX_RayEventManager.h
@@ -30,8 +30,8 @@
  *  \brief Manager for ray events
  */
 
-#ifndef __KX_RAYEVENTMGR
-#define __KX_RAYEVENTMGR
+#ifndef __KX_RAYEVENTMANAGER_H__
+#define __KX_RAYEVENTMANAGER_H__
 #include "SCA_EventManager.h"
 #include <vector>
 using namespace std;
@@ -52,5 +52,5 @@ public:
 #endif
 };
 
-#endif //__KX_RAYEVENTMGR
+#endif //__KX_RAYEVENTMANAGER_H__
 
diff --git a/source/gameengine/Ketsji/KX_RaySensor.h b/source/gameengine/Ketsji/KX_RaySensor.h
index 4c0009a5a4c..f5d1c72d098 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.h
+++ b/source/gameengine/Ketsji/KX_RaySensor.h
@@ -30,8 +30,8 @@
  *  \brief Cast a ray and feel for objects
  */
 
-#ifndef __KX_RAYSENSOR_H
-#define __KX_RAYSENSOR_H
+#ifndef __KX_RAYSENSOR_H__
+#define __KX_RAYSENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "MT_Point3.h"
@@ -100,5 +100,5 @@ public:
 
 };
 
-#endif //__KX_RAYSENSOR_H
+#endif //__KX_RAYSENSOR_H__
 
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
index ec5cf305c3e..d9cd1b5ff24 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
@@ -30,8 +30,8 @@
  * Please look here for revision history.
  */
 
-#ifndef __KX_SCA_AddObjectActuator
-#define __KX_SCA_AddObjectActuator
+#ifndef __KX_SCA_ADDOBJECTACTUATOR_H__
+#define __KX_SCA_ADDOBJECTACTUATOR_H__
 
 /* Actuator tree */
 #include "SCA_IActuator.h"
diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
index 5fefbb8cca5..885c7a0297f 100644
--- a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
@@ -30,8 +30,8 @@
  *  \brief Add object to the game world on action of this actuator
  */
 
-#ifndef __KX_SCA_DYNAMICACTUATOR
-#define __KX_SCA_DYNAMICACTUATOR
+#ifndef __KX_SCA_DYNAMICACTUATOR_H__
+#define __KX_SCA_DYNAMICACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_PropertyActuator.h"
diff --git a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
index 7a325257e59..374d5f2f211 100644
--- a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
@@ -32,8 +32,8 @@
  * Please look here for revision history.
  */
 
-#ifndef __KX_SCA_ENDOBJECTACTUATOR
-#define __KX_SCA_ENDOBJECTACTUATOR
+#ifndef __KX_SCA_ENDOBJECTACTUATOR_H__
+#define __KX_SCA_ENDOBJECTACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
index 3e07ec2665c..c8e6123024d 100644
--- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
@@ -32,8 +32,8 @@
  *  Please look here for revision history.
  */
 
-#ifndef __KX_SCA_REPLACEMESHACTUATOR
-#define __KX_SCA_REPLACEMESHACTUATOR
+#ifndef __KX_SCA_REPLACEMESHACTUATOR_H__
+#define __KX_SCA_REPLACEMESHACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_PropertyActuator.h"
diff --git a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
index 0eff0ea62ba..734f82731b8 100644
--- a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
+++ b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
@@ -30,8 +30,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_SG_BONEPARENTRELATION_H__
-#define __KX_SG_BONEPARENTRELATION_H__
+#ifndef __KX_SG_BONEPARENTNODERELATIONSHIP_H__
+#define __KX_SG_BONEPARENTNODERELATIONSHIP_H__
  
 #include "SG_Spatial.h"
 #include "SG_ParentRelation.h"
diff --git a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
index 94fea9687a5..44864c87cd7 100644
--- a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
+++ b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
@@ -39,8 +39,8 @@
  * inherited by the child. 
  */
 
-#ifndef __KX_SG_NODERELATIONS_H__
-#define __KX_SG_NODERELATIONS_H__
+#ifndef __KX_SG_NODERELATIONSHIPS_H__
+#define __KX_SG_NODERELATIONSHIPS_H__
 
 #include "SG_Spatial.h"
 #include "SG_ParentRelation.h"
diff --git a/source/gameengine/Ketsji/KX_ScalarInterpolator.h b/source/gameengine/Ketsji/KX_ScalarInterpolator.h
index 9e5a43ecff9..d08a32ce0aa 100644
--- a/source/gameengine/Ketsji/KX_ScalarInterpolator.h
+++ b/source/gameengine/Ketsji/KX_ScalarInterpolator.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_SCALARINTERPOLATOR
-#define KX_SCALARINTERPOLATOR
+#ifndef __KX_SCALARINTERPOLATOR_H__
+#define __KX_SCALARINTERPOLATOR_H__
 
 #include "MT_Scalar.h"
 #include "KX_IInterpolator.h"
diff --git a/source/gameengine/Ketsji/KX_ScalingInterpolator.h b/source/gameengine/Ketsji/KX_ScalingInterpolator.h
index 520706b9721..ae8b25f9185 100644
--- a/source/gameengine/Ketsji/KX_ScalingInterpolator.h
+++ b/source/gameengine/Ketsji/KX_ScalingInterpolator.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_SCALINGINTERPOLATOR
-#define KX_SCALINGINTERPOLATOR
+#ifndef __KX_SCALINGINTERPOLATOR_H__
+#define __KX_SCALINGINTERPOLATOR_H__
 
 #include "KX_IInterpolator.h"
 
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index 8fcfe46e643..ca57548be2a 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_SCENE_H
-#define __KX_SCENE_H
+#ifndef __KX_SCENE_H__
+#define __KX_SCENE_H__
 
 
 #include "KX_PhysicsEngineEnums.h"
@@ -665,5 +665,5 @@ public:
 
 typedef std::vector<KX_Scene*> KX_SceneList;
 
-#endif //__KX_SCENE_H
+#endif //__KX_SCENE_H__
 
diff --git a/source/gameengine/Ketsji/KX_SceneActuator.h b/source/gameengine/Ketsji/KX_SceneActuator.h
index 9064146a1d4..774f740dd00 100644
--- a/source/gameengine/Ketsji/KX_SceneActuator.h
+++ b/source/gameengine/Ketsji/KX_SceneActuator.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_SCENEACTUATOR
-#define __KX_SCENEACTUATOR
+#ifndef __KX_SCENEACTUATOR_H__
+#define __KX_SCENEACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_IScene.h" /* Replace_IScene only */
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h
index b9119677f4f..71ec3ae2f59 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.h
+++ b/source/gameengine/Ketsji/KX_SoundActuator.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_SOUNDACTUATOR
-#define __KX_SOUNDACTUATOR
+#ifndef __KX_SOUNDACTUATOR_H__
+#define __KX_SOUNDACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
@@ -127,5 +127,5 @@ public:
 
 };
 
-#endif //__KX_SOUNDACTUATOR
+#endif //__KX_SOUNDACTUATOR_H__
 
diff --git a/source/gameengine/Ketsji/KX_StateActuator.h b/source/gameengine/Ketsji/KX_StateActuator.h
index aa17b687463..5ed065d3604 100644
--- a/source/gameengine/Ketsji/KX_StateActuator.h
+++ b/source/gameengine/Ketsji/KX_StateActuator.h
@@ -30,8 +30,8 @@
  *  \brief Actuator to toggle visibility/invisibility of objects
  */
 
-#ifndef __KX_STATEACTUATOR
-#define __KX_STATEACTUATOR
+#ifndef __KX_STATEACTUATOR_H__
+#define __KX_STATEACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.h b/source/gameengine/Ketsji/KX_SteeringActuator.h
index 0e9d4c7e3a0..f0c3e73ddec 100644
--- a/source/gameengine/Ketsji/KX_SteeringActuator.h
+++ b/source/gameengine/Ketsji/KX_SteeringActuator.h
@@ -24,8 +24,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __KX_STEERINGACTUATOR
-#define __KX_STEERINGACTUATOR
+#ifndef __KX_STEERINGACTUATOR_H__
+#define __KX_STEERINGACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_LogicManager.h"
diff --git a/source/gameengine/Ketsji/KX_TimeCategoryLogger.h b/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
index 9c9df290e43..f01e405d3df 100644
--- a/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
+++ b/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_TIME_CATEGORY_LOGGER_H
-#define __KX_TIME_CATEGORY_LOGGER_H
+#ifndef __KX_TIMECATEGORYLOGGER_H__
+#define __KX_TIMECATEGORYLOGGER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@@ -135,5 +135,5 @@ public:
 #endif
 };
 
-#endif // __KX_TIME_CATEGORY_LOGGER_H
+#endif // __KX_TIMECATEGORYLOGGER_H__
 
diff --git a/source/gameengine/Ketsji/KX_TimeLogger.h b/source/gameengine/Ketsji/KX_TimeLogger.h
index 0f29f44e726..16d97c1fe41 100644
--- a/source/gameengine/Ketsji/KX_TimeLogger.h
+++ b/source/gameengine/Ketsji/KX_TimeLogger.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_TIME_LOGGER_H
-#define __KX_TIME_LOGGER_H
+#ifndef __KX_TIMELOGGER_H__
+#define __KX_TIMELOGGER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@@ -113,5 +113,5 @@ public:
 #endif
 };
 
-#endif // __KX_TIME_LOGGER_H
+#endif // __KX_TIMELOGGER_H__
 
diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.h b/source/gameengine/Ketsji/KX_TouchEventManager.h
index b219f334b84..38286cba9aa 100644
--- a/source/gameengine/Ketsji/KX_TouchEventManager.h
+++ b/source/gameengine/Ketsji/KX_TouchEventManager.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_TOUCHEVENTMANAGER
-#define __KX_TOUCHEVENTMANAGER
+#ifndef __KX_TOUCHEVENTMANAGER_H__
+#define __KX_TOUCHEVENTMANAGER_H__
 
 
 #include "SCA_EventManager.h"
@@ -87,5 +87,5 @@ public:
 #endif
 };
 
-#endif //__KX_TOUCHEVENTMANAGER
+#endif //__KX_TOUCHEVENTMANAGER_H__
 
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h
index 1fae766aa13..1ce1742ed46 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.h
+++ b/source/gameengine/Ketsji/KX_TouchSensor.h
@@ -30,8 +30,8 @@
  *  \brief Senses touch and collision events
  */
 
-#ifndef __KX_TOUCHSENSOR
-#define __KX_TOUCHSENSOR
+#ifndef __KX_TOUCHSENSOR_H__
+#define __KX_TOUCHSENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "ListValue.h"
@@ -132,5 +132,5 @@ public:
 	
 };
 
-#endif //__KX_TOUCHSENSOR
+#endif //__KX_TOUCHSENSOR_H__
 
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.h b/source/gameengine/Ketsji/KX_TrackToActuator.h
index 30e276c0021..8eb69b1ad08 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.h
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_TrackToActuator
-#define __KX_TrackToActuator
+#ifndef __KX_TRACKTOACTUATOR_H__
+#define __KX_TRACKTOACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_IObject.h"
diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.h b/source/gameengine/Ketsji/KX_VehicleWrapper.h
index f6e360d34a8..3684019277c 100644
--- a/source/gameengine/Ketsji/KX_VehicleWrapper.h
+++ b/source/gameengine/Ketsji/KX_VehicleWrapper.h
@@ -3,8 +3,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_VEHICLE_WRAPPER
-#define KX_VEHICLE_WRAPPER
+#ifndef __KX_VEHICLEWRAPPER_H__
+#define __KX_VEHICLEWRAPPER_H__
 
 #include "Value.h"
 #include "PHY_DynamicTypes.h"
@@ -59,4 +59,4 @@ private:
 	PHY_IPhysicsEnvironment* m_physenv;
 };
 
-#endif //KX_VEHICLE_WRAPPER
+#endif //__KX_VEHICLEWRAPPER_H__
diff --git a/source/gameengine/Ketsji/KX_VertexProxy.h b/source/gameengine/Ketsji/KX_VertexProxy.h
index 905a4e0f4ab..baed5330f7e 100644
--- a/source/gameengine/Ketsji/KX_VertexProxy.h
+++ b/source/gameengine/Ketsji/KX_VertexProxy.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_VERTEXPROXY
-#define __KX_VERTEXPROXY
+#ifndef __KX_VERTEXPROXY_H__
+#define __KX_VERTEXPROXY_H__
 
 #ifdef WITH_PYTHON
 
@@ -107,5 +107,5 @@ public:
 
 #endif // WITH_PYTHON
 
-#endif //__KX_VERTEXPROXY
+#endif //__KX_VERTEXPROXY_H__
 
diff --git a/source/gameengine/Ketsji/KX_VisibilityActuator.h b/source/gameengine/Ketsji/KX_VisibilityActuator.h
index f5c45ecbd99..a207844db74 100644
--- a/source/gameengine/Ketsji/KX_VisibilityActuator.h
+++ b/source/gameengine/Ketsji/KX_VisibilityActuator.h
@@ -30,8 +30,8 @@
  *  \brief Actuator to toggle visibility/invisibility of objects
  */
 
-#ifndef __KX_VISIBILITYACTUATOR
-#define __KX_VISIBILITYACTUATOR
+#ifndef __KX_VISIBILITYACTUATOR_H__
+#define __KX_VISIBILITYACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
diff --git a/source/gameengine/Ketsji/KX_WorldInfo.h b/source/gameengine/Ketsji/KX_WorldInfo.h
index c5ce5480409..cb4e9de50c2 100644
--- a/source/gameengine/Ketsji/KX_WorldInfo.h
+++ b/source/gameengine/Ketsji/KX_WorldInfo.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_WORLDINFO_H
-#define __KX_WORLDINFO_H
+#ifndef __KX_WORLDINFO_H__
+#define __KX_WORLDINFO_H__
 
 #include "MT_Scalar.h"
 
@@ -76,5 +76,5 @@ public:
 #endif
 };
 
-#endif //__KX_WORLDINFO_H
+#endif //__KX_WORLDINFO_H__
 
diff --git a/source/gameengine/Ketsji/KX_WorldIpoController.h b/source/gameengine/Ketsji/KX_WorldIpoController.h
index 5c55e4fdc63..1f60280e355 100644
--- a/source/gameengine/Ketsji/KX_WorldIpoController.h
+++ b/source/gameengine/Ketsji/KX_WorldIpoController.h
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_WORLDIPOCONTROLLER_H
-#define KX_WORLDIPOCONTROLLER_H
+#ifndef __KX_WORLDIPOCONTROLLER_H__
+#define __KX_WORLDIPOCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "SG_Spatial.h"
@@ -102,5 +102,5 @@ public:
 #endif
 };
 
-#endif // KX_LIGHTIPOSGCONTROLLER_H
+#endif // __KX_WORLDIPOCONTROLLER_H__
 
diff --git a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
index 968d56b2473..a356b20ed1a 100644
--- a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
+++ b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
@@ -29,8 +29,8 @@
  *  \ingroup bgenetlb
  *  \brief LoopbackNetworkDeviceInterface derived from NG_NetworkDeviceInterface
  */
-#ifndef NG_LOOPBACKNETWORKDEVICEINTERFACE_H
-#define NG_LOOPBACKNETWORKDEVICEINTERFACE_H
+#ifndef __NG_LOOPBACKNETWORKDEVICEINTERFACE_H__
+#define __NG_LOOPBACKNETWORKDEVICEINTERFACE_H__
 
 #include <deque>
 #include "NG_NetworkDeviceInterface.h"
@@ -58,5 +58,5 @@ public:
 	virtual std::vector<NG_NetworkMessage*>		RetrieveNetworkMessages();
 };
 
-#endif //NG_LOOPBACKNETWORKDEVICEINTERFACE_H
+#endif //__NG_LOOPBACKNETWORKDEVICEINTERFACE_H__
 
diff --git a/source/gameengine/Network/NG_NetworkDeviceInterface.h b/source/gameengine/Network/NG_NetworkDeviceInterface.h
index ce5720c070f..d4a3d12057e 100644
--- a/source/gameengine/Network/NG_NetworkDeviceInterface.h
+++ b/source/gameengine/Network/NG_NetworkDeviceInterface.h
@@ -31,8 +31,8 @@
  * To be derived by loopback and network libraries
  */
 
-#ifndef NG_NETWORKDEVICEINTERFACE_H
-#define NG_NETWORKDEVICEINTERFACE_H
+#ifndef __NG_NETWORKDEVICEINTERFACE_H__
+#define __NG_NETWORKDEVICEINTERFACE_H__
 
 #include "NG_NetworkMessage.h"
 #include <vector>
@@ -81,5 +81,5 @@ public:
 #endif
 };
 
-#endif //NG_NETWORKDEVICEINTERFACE_H
+#endif //__NG_NETWORKDEVICEINTERFACE_H__
 
diff --git a/source/gameengine/Network/NG_NetworkMessage.h b/source/gameengine/Network/NG_NetworkMessage.h
index 75da167ea3e..a0c61784e9f 100644
--- a/source/gameengine/Network/NG_NetworkMessage.h
+++ b/source/gameengine/Network/NG_NetworkMessage.h
@@ -29,8 +29,8 @@
  *  \ingroup bgenet
  *  \brief generic Network Message class
  */
-#ifndef NG_NETWORKMESSAGE_H
-#define NG_NETWORKMESSAGE_H
+#ifndef __NG_NETWORKMESSAGE_H__
+#define __NG_NETWORKMESSAGE_H__
 
 #include "STR_HashedString.h"
 
@@ -137,5 +137,5 @@ public:
 #endif
 };
 
-#endif //NG_NETWORKMESSAGE_H
+#endif //__NG_NETWORKMESSAGE_H__
 
diff --git a/source/gameengine/Network/NG_NetworkObject.h b/source/gameengine/Network/NG_NetworkObject.h
index b3f5a180aad..b7b01bdad06 100644
--- a/source/gameengine/Network/NG_NetworkObject.h
+++ b/source/gameengine/Network/NG_NetworkObject.h
@@ -29,8 +29,8 @@
  *  \ingroup bgenet
  *  \brief generic Network Object class
  */
-#ifndef NG_NETWORKOBJECT_H
-#define NG_NETWORKOBJECT_H
+#ifndef __NG_NETWORKOBJECT_H__
+#define __NG_NETWORKOBJECT_H__
 
 #include "STR_String.h"
 
@@ -54,5 +54,5 @@ public:
 #endif
 };
 
-#endif //NG_NETWORKOBJECT_H
+#endif //__NG_NETWORKOBJECT_H__
 
diff --git a/source/gameengine/Network/NG_NetworkScene.h b/source/gameengine/Network/NG_NetworkScene.h
index c0469f21850..cd6f9925582 100644
--- a/source/gameengine/Network/NG_NetworkScene.h
+++ b/source/gameengine/Network/NG_NetworkScene.h
@@ -29,8 +29,8 @@
  *  \ingroup bgenet
  *  \brief NetworkSceneManagement generic class
  */
-#ifndef __NG_NETWORKSCENE_H
-#define __NG_NETWORKSCENE_H
+#ifndef __NG_NETWORKSCENE_H__
+#define __NG_NETWORKSCENE_H__
 
 #include "CTR_Map.h"
 #include "STR_HashedString.h"
@@ -117,5 +117,5 @@ public:
 #endif
 };
 
-#endif //__NG_NETWORKSCENE_H
+#endif //__NG_NETWORKSCENE_H__
 
diff --git a/source/gameengine/Physics/Bullet/CcdGraphicController.h b/source/gameengine/Physics/Bullet/CcdGraphicController.h
index d0cb899cb74..07878b7162e 100644
--- a/source/gameengine/Physics/Bullet/CcdGraphicController.h
+++ b/source/gameengine/Physics/Bullet/CcdGraphicController.h
@@ -18,8 +18,8 @@ subject to the following restrictions:
  */
 
 
-#ifndef BULLET2_GRAPHICCONTROLLER_H
-#define BULLET2_GRAPHICCONTROLLER_H
+#ifndef __CCDGRAPHICCONTROLLER_H__
+#define __CCDGRAPHICCONTROLLER_H__
 
 #include "PHY_IGraphicController.h"
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 82acd64161f..33b30758ff0 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -18,8 +18,8 @@ subject to the following restrictions:
  */
 
 
-#ifndef BULLET2_PHYSICSCONTROLLER_H
-#define BULLET2_PHYSICSCONTROLLER_H
+#ifndef __CCDPHYSICSCONTROLLER_H__
+#define __CCDPHYSICSCONTROLLER_H__
 
 #include <vector>
 #include <map>
@@ -656,4 +656,4 @@ public:
 };
 
 
-#endif //BULLET2_PHYSICSCONTROLLER_H
+#endif //__CCDPHYSICSCONTROLLER_H__
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index 1eed0665564..1315bc732a2 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -18,8 +18,8 @@ subject to the following restrictions:
  *  See also \ref bulletdoc
  */
 
-#ifndef CCDPHYSICSENVIRONMENT
-#define CCDPHYSICSENVIRONMENT
+#ifndef __CCDPHYSICSENVIRONMENT_H__
+#define __CCDPHYSICSENVIRONMENT_H__
 
 #include "PHY_IPhysicsEnvironment.h"
 #include <vector>
@@ -294,4 +294,4 @@ public:
 #endif
 };
 
-#endif //CCDPHYSICSENVIRONMENT
+#endif //__CCDPHYSICSENVIRONMENT_H__
diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
index d0073d772c8..8e55c4a0c0f 100644
--- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
@@ -29,8 +29,8 @@
  *  \ingroup physdummy
  */
 
-#ifndef _DUMMYPHYSICSENVIRONMENT
-#define _DUMMYPHYSICSENVIRONMENT
+#ifndef __DUMMYPHYSICSENVIRONMENT_H__
+#define __DUMMYPHYSICSENVIRONMENT_H__
 
 #include "PHY_IPhysicsEnvironment.h"
 
@@ -104,5 +104,5 @@ public:
 #endif
 };
 
-#endif //_DUMMYPHYSICSENVIRONMENT
+#endif //__DUMMYPHYSICSENVIRONMENT_H__
 
diff --git a/source/gameengine/Physics/common/PHY_DynamicTypes.h b/source/gameengine/Physics/common/PHY_DynamicTypes.h
index a1761131a8e..a72929d25c5 100644
--- a/source/gameengine/Physics/common/PHY_DynamicTypes.h
+++ b/source/gameengine/Physics/common/PHY_DynamicTypes.h
@@ -17,8 +17,8 @@ subject to the following restrictions:
  *  \ingroup phys
  */
 
-#ifndef __PHY_DYNAMIC_TYPES
-#define __PHY_DYNAMIC_TYPES
+#ifndef __PHY_DYNAMICTYPES_H__
+#define __PHY_DYNAMICTYPES_H__
 
 
 
@@ -151,4 +151,4 @@ typedef enum PHY_ShapeType {
 
 typedef float	PHY_Vector3[3];
 
-#endif //__PHY_DYNAMIC_TYPES
+#endif //__PHY_DYNAMICTYPES_H__
diff --git a/source/gameengine/Physics/common/PHY_IController.h b/source/gameengine/Physics/common/PHY_IController.h
index 672f2e5a655..d25af9f898c 100644
--- a/source/gameengine/Physics/common/PHY_IController.h
+++ b/source/gameengine/Physics/common/PHY_IController.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY_ICONTROLLER_H
-#define PHY_ICONTROLLER_H
+#ifndef __PHY_ICONTROLLER_H__
+#define __PHY_ICONTROLLER_H__
 
 #include "PHY_DynamicTypes.h"
 
@@ -62,5 +62,5 @@ public:
 #endif
 };
 
-#endif //PHY_ICONTROLLER_H
+#endif //__PHY_ICONTROLLER_H__
 
diff --git a/source/gameengine/Physics/common/PHY_IGraphicController.h b/source/gameengine/Physics/common/PHY_IGraphicController.h
index 46f17014090..6a94b3d6ea9 100644
--- a/source/gameengine/Physics/common/PHY_IGraphicController.h
+++ b/source/gameengine/Physics/common/PHY_IGraphicController.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY_IGRAPHICCONTROLLER_H
-#define PHY_IGRAPHICCONTROLLER_H
+#ifndef __PHY_IGRAPHICCONTROLLER_H__
+#define __PHY_IGRAPHICCONTROLLER_H__
 
 #include "PHY_IController.h"
 
@@ -59,5 +59,5 @@ class PHY_IGraphicController : public PHY_IController
 #endif
 };
 
-#endif //PHY_IGRAPHICCONTROLLER_H
+#endif //__PHY_IGRAPHICCONTROLLER_H__
 
diff --git a/source/gameengine/Physics/common/PHY_IMotionState.h b/source/gameengine/Physics/common/PHY_IMotionState.h
index 1ffd3adac9a..77c51ebdb79 100644
--- a/source/gameengine/Physics/common/PHY_IMotionState.h
+++ b/source/gameengine/Physics/common/PHY_IMotionState.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY__MOTIONSTATE_H
-#define PHY__MOTIONSTATE_H
+#ifndef __PHY_IMOTIONSTATE_H__
+#define __PHY_IMOTIONSTATE_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -67,5 +67,5 @@ public:
 #endif
 };
 
-#endif //PHY__MOTIONSTATE_H
+#endif //__PHY_IMOTIONSTATE_H__
 
diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.h b/source/gameengine/Physics/common/PHY_IPhysicsController.h
index 31a7d71745e..727cbda931d 100644
--- a/source/gameengine/Physics/common/PHY_IPhysicsController.h
+++ b/source/gameengine/Physics/common/PHY_IPhysicsController.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY_IPHYSICSCONTROLLER_H
-#define PHY_IPHYSICSCONTROLLER_H
+#ifndef __PHY_IPHYSICSCONTROLLER_H__
+#define __PHY_IPHYSICSCONTROLLER_H__
 
 #include "PHY_IController.h"
 
@@ -109,5 +109,5 @@ public:
 #endif
 };
 
-#endif //PHY_IPHYSICSCONTROLLER_H
+#endif //__PHY_IPHYSICSCONTROLLER_H__
 
diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
index adf6fb03bc1..f64f55b6592 100644
--- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
+++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef _IPHYSICSENVIRONMENT
-#define _IPHYSICSENVIRONMENT
+#ifndef __PHY_IPHYSICSENVIRONMENT_H__
+#define __PHY_IPHYSICSENVIRONMENT_H__
 
 #include <vector>
 #include "PHY_DynamicTypes.h"
@@ -187,5 +187,5 @@ public:
 #endif
 };
 
-#endif //_IPHYSICSENVIRONMENT
+#endif //__PHY_IPHYSICSENVIRONMENT_H__
 
diff --git a/source/gameengine/Physics/common/PHY_IVehicle.h b/source/gameengine/Physics/common/PHY_IVehicle.h
index da9daa29977..735ce5a8791 100644
--- a/source/gameengine/Physics/common/PHY_IVehicle.h
+++ b/source/gameengine/Physics/common/PHY_IVehicle.h
@@ -3,8 +3,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY_IVEHICLE_H
-#define PHY_IVEHICLE_H
+#ifndef __PHY_IVEHICLE_H__
+#define __PHY_IVEHICLE_H__
 
 //PHY_IVehicle provides a generic interface for (raycast based) vehicles. Mostly targetting 4 wheel cars and 2 wheel motorbikes.
 
@@ -68,4 +68,4 @@ public:
 #endif
 };
 
-#endif //PHY_IVEHICLE_H
+#endif //__PHY_IVEHICLE_H__
diff --git a/source/gameengine/Physics/common/PHY_Pro.h b/source/gameengine/Physics/common/PHY_Pro.h
index 4189db27c17..110d4731cdc 100644
--- a/source/gameengine/Physics/common/PHY_Pro.h
+++ b/source/gameengine/Physics/common/PHY_Pro.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY_PROPSH
-#define PHY_PROPSH
+#ifndef __PHY_PRO_H__
+#define __PHY_PRO_H__
 
 #include <MT_Scalar.h>
 
@@ -59,5 +59,5 @@ struct PHY_MaterialProps {
 	bool      m_fh_normal;             // Should the object slide off slopes?
 };
 
-#endif //PHY_PROPSH
+#endif //__PHY_PRO_H__
 
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.h b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
index 4510747c0e5..d3b23deab52 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.h
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_I2DFILTER
-#define __RAS_I2DFILTER
+#ifndef __RAS_2DFILTERMANAGER_H__
+#define __RAS_2DFILTERMANAGER_H__
 
 #include "RAS_ICanvas.h"
 #define MAX_RENDER_PASS	100
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.h b/source/gameengine/Rasterizer/RAS_BucketManager.h
index b4b5465fdb6..032d9b03299 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.h
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_BUCKETMANAGER
-#define __RAS_BUCKETMANAGER
+#ifndef __RAS_BUCKETMANAGER_H__
+#define __RAS_BUCKETMANAGER_H__
 
 #include "MT_Transform.h"
 #include "RAS_MaterialBucket.h"
@@ -91,5 +91,5 @@ public:
 #endif
 };
 
-#endif //__RAS_BUCKETMANAGER
+#endif //__RAS_BUCKETMANAGER_H__
 
diff --git a/source/gameengine/Rasterizer/RAS_CameraData.h b/source/gameengine/Rasterizer/RAS_CameraData.h
index 2120a18f139..4a70df6e505 100644
--- a/source/gameengine/Rasterizer/RAS_CameraData.h
+++ b/source/gameengine/Rasterizer/RAS_CameraData.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_CAMERADATA_H
-#define __RAS_CAMERADATA_H
+#ifndef __RAS_CAMERADATA_H__
+#define __RAS_CAMERADATA_H__
 
 struct RAS_CameraData
 {
@@ -71,5 +71,5 @@ struct RAS_CameraData
 	}
 };
 
-#endif //__RAS_CAMERADATA_H
+#endif //__RAS_CAMERADATA_H__
 
diff --git a/source/gameengine/Rasterizer/RAS_Deformer.h b/source/gameengine/Rasterizer/RAS_Deformer.h
index 6113589c39f..1e9a792634a 100644
--- a/source/gameengine/Rasterizer/RAS_Deformer.h
+++ b/source/gameengine/Rasterizer/RAS_Deformer.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef RAS_DEFORMER
-#define RAS_DEFORMER
+#ifndef __RAS_DEFORMER_H__
+#define __RAS_DEFORMER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.h b/source/gameengine/Rasterizer/RAS_FramingManager.h
index 612142234e3..4ea2d998190 100644
--- a/source/gameengine/Rasterizer/RAS_FramingManager.h
+++ b/source/gameengine/Rasterizer/RAS_FramingManager.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef RAS_FRAMINGMANAGER_H
-#define RAS_FRAMINGMANAGER_H
+#ifndef __RAS_FRAMINGMANAGER_H__
+#define __RAS_FRAMINGMANAGER_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
diff --git a/source/gameengine/Rasterizer/RAS_ICanvas.h b/source/gameengine/Rasterizer/RAS_ICanvas.h
index 2c2f62c946e..e35ec1d16d2 100644
--- a/source/gameengine/Rasterizer/RAS_ICanvas.h
+++ b/source/gameengine/Rasterizer/RAS_ICanvas.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_ICANVAS
-#define __RAS_ICANVAS
+#ifndef __RAS_ICANVAS_H__
+#define __RAS_ICANVAS_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -225,5 +225,5 @@ public:
 #endif
 };
 
-#endif //__RAS_ICANVAS
+#endif //__RAS_ICANVAS_H__
 
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
index 6527b0d58ce..0da0b17f6c1 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_IPOLYGONMATERIAL
-#define __RAS_IPOLYGONMATERIAL
+#ifndef __RAS_IPOLYGONMATERIAL_H__
+#define __RAS_IPOLYGONMATERIAL_H__
 
 #include "STR_HashedString.h"
 
@@ -204,5 +204,5 @@ inline  bool operator < ( const RAS_IPolyMaterial & lhs, const RAS_IPolyMaterial
 	return lhs.Less(rhs);
 }
 
-#endif //__RAS_IPOLYGONMATERIAL
+#endif //__RAS_IPOLYGONMATERIAL_H__
 
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h
index 70b91cc826f..c749868cf79 100644
--- a/source/gameengine/Rasterizer/RAS_IRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_IRASTERIZER
-#define __RAS_IRASTERIZER
+#ifndef __RAS_IRASTERIZER_H__
+#define __RAS_IRASTERIZER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786)
@@ -425,6 +425,6 @@ public:
 #endif
 };
 
-#endif //__RAS_IRASTERIZER
+#endif //__RAS_IRASTERIZER_H__
 
 
diff --git a/source/gameengine/Rasterizer/RAS_IRenderTools.h b/source/gameengine/Rasterizer/RAS_IRenderTools.h
index b7e81e1a252..27b328412d2 100644
--- a/source/gameengine/Rasterizer/RAS_IRenderTools.h
+++ b/source/gameengine/Rasterizer/RAS_IRenderTools.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_IRENDERTOOLS
-#define __RAS_IRENDERTOOLS
+#ifndef __RAS_IRENDERTOOLS_H__
+#define __RAS_IRENDERTOOLS_H__
 
 #include "MT_Transform.h"
 #include "RAS_IRasterizer.h"
@@ -210,7 +210,7 @@ public:
 #endif
 };
 
-#endif //__RAS_IRENDERTOOLS
+#endif //__RAS_IRENDERTOOLS_H__
 
 
 
diff --git a/source/gameengine/Rasterizer/RAS_LightObject.h b/source/gameengine/Rasterizer/RAS_LightObject.h
index 78e57e2b786..c378a9ea0c2 100644
--- a/source/gameengine/Rasterizer/RAS_LightObject.h
+++ b/source/gameengine/Rasterizer/RAS_LightObject.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_LIGHTOBJECT_H
-#define __RAS_LIGHTOBJECT_H
+#ifndef __RAS_LIGHTOBJECT_H__
+#define __RAS_LIGHTOBJECT_H__
 
 #include "MT_CmMatrix4x4.h"
 
@@ -64,5 +64,5 @@ struct RAS_LightObject
 	bool	m_nospecular;
 };
 
-#endif //__RAS_LIGHTOBJECT_H
+#endif //__RAS_LIGHTOBJECT_H__
 
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
index 5c8e2f2c085..4142ebd2e39 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_MATERIALBUCKET
-#define __RAS_MATERIALBUCKET
+#ifndef __RAS_MATERIALBUCKET_H__
+#define __RAS_MATERIALBUCKET_H__
 
 #include "RAS_TexVert.h"
 #include "CTR_Map.h"
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index 982ce488a82..b3e84c4656b 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_MESHOBJECT
-#define __RAS_MESHOBJECT
+#ifndef __RAS_MESHOBJECT_H__
+#define __RAS_MESHOBJECT_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 // disable the STL warnings ("debug information length > 255")
@@ -179,5 +179,5 @@ public:
 #endif
 };
 
-#endif //__RAS_MESHOBJECT
+#endif //__RAS_MESHOBJECT_H__
 
diff --git a/source/gameengine/Rasterizer/RAS_ObjectColor.h b/source/gameengine/Rasterizer/RAS_ObjectColor.h
index ad2002ebc82..f8fbe69e97b 100644
--- a/source/gameengine/Rasterizer/RAS_ObjectColor.h
+++ b/source/gameengine/Rasterizer/RAS_ObjectColor.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_OBJECTCOLOR_H
-#define __RAS_OBJECTCOLOR_H
+#ifndef __RAS_OBJECTCOLOR_H__
+#define __RAS_OBJECTCOLOR_H__
 
 struct	RAS_ObjectColor {
 	float	m_red;
@@ -38,5 +38,5 @@ struct	RAS_ObjectColor {
 	float	m_blue;
 };
 
-#endif //__RAS_OBJECTCOLOR_H
+#endif //__RAS_OBJECTCOLOR_H__
 
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
index 3a3ea57d67b..c2595fb0d26 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_BLUR2DFILTER
-#define __RAS_BLUR2DFILTER
+#ifndef __RAS_BLUR2DFILTER_H__
+#define __RAS_BLUR2DFILTER_H__
 
 const char * BlurFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
index f486be47f9f..12b815a1519 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_DILATION2DFILTER
-#define __RAS_DILATION2DFILTER
+#ifndef __RAS_DILATION2DFILTER_H__
+#define __RAS_DILATION2DFILTER_H__
 
 const char * DilationFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
index a1755dc0eeb..6319be6ce4a 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_EROSION2DFILTER
-#define __RAS_EROSION2DFILTER
+#ifndef __RAS_EROSION2DFILTER_H__
+#define __RAS_EROSION2DFILTER_H__
 
 const char * ErosionFragmentShader=STRINGIFY(
             uniform sampler2D bgl_RenderedTexture;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
index baf3d9c1166..f3c3aece7d5 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_GRAYSCALE2DFILTER
-#define __RAS_GRAYSCALE2DFILTER
+#ifndef __RAS_GRAYSCALE2DFILTER_H__
+#define __RAS_GRAYSCALE2DFILTER_H__
 
 const char * GrayScaleFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
index 7df271c15e4..c04d9543e89 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_INVERT2DFILTER
-#define __RAS_INVERT2DFILTER
+#ifndef __RAS_INVERT2DFILTER_H__
+#define __RAS_INVERT2DFILTER_H__
 
 const char * InvertFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
index 45c94d358ba..47f7d80d9d7 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_LAPLACION2DFILTER
-#define __RAS_LAPLACION2DFILTER
+#ifndef __RAS_LAPLACIAN2DFILTER_H__
+#define __RAS_LAPLACIAN2DFILTER_H__
 
 const char * LaplacionFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
index 8d08d9077cb..8b2fdc71cfb 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_PREWITT2DFILTER
-#define __RAS_PREWITT2DFILTER
+#ifndef __RAS_PREWITT2DFILTER_H__
+#define __RAS_PREWITT2DFILTER_H__
 
 const char * PrewittFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
index 5c1c18c30c1..b38d14a3746 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_SEPIA2DFILTER
-#define __RAS_SEPIA2DFILTER
+#ifndef __RAS_SEPIA2DFILTER_H__
+#define __RAS_SEPIA2DFILTER_H__
 
 const char * SepiaFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
index a9c827fa9e1..2e0edae61c4 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_SHARPEN2DFILTER
-#define __RAS_SHARPEN2DFILTER
+#ifndef __RAS_SHARPEN2DFILTER_H__
+#define __RAS_SHARPEN2DFILTER_H__
 
 const char * SharpenFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
index 350ce19fafd..ba30e497923 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_SOBEL2DFILTER
-#define __RAS_SOBEL2DFILTER
+#ifndef __RAS_SOBEL2DFILTER_H__
+#define __RAS_SOBEL2DFILTER_H__
 
 const char * SobelFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
index 48705c3047a..e10d006994f 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastogl
  */
 
-#ifndef __RAS_OPENGLRASTERIZER
-#define __RAS_OPENGLRASTERIZER
+#ifndef __RAS_OPENGLRASTERIZER_H__
+#define __RAS_OPENGLRASTERIZER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786)
@@ -324,6 +324,6 @@ public:
 #endif
 };
 
-#endif //__RAS_OPENGLRASTERIZER
+#endif //__RAS_OPENGLRASTERIZER_H__
 
 
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
index c0c6f5d060c..d96f390ad74 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerastogl
  */
 
-#ifndef __KX_VERTEXARRAYOPENGLRASTERIZER
-#define __KX_VERTEXARRAYOPENGLRASTERIZER
+#ifndef __RAS_VAOPENGLRASTERIZER_H__
+#define __RAS_VAOPENGLRASTERIZER_H__
 
 #include "RAS_OpenGLRasterizer.h"
 
@@ -69,5 +69,5 @@ public:
 #endif
 };
 
-#endif //__KX_VERTEXARRAYOPENGLRASTERIZER
+#endif //__RAS_VAOPENGLRASTERIZER_H__
 
diff --git a/source/gameengine/Rasterizer/RAS_Polygon.h b/source/gameengine/Rasterizer/RAS_Polygon.h
index 6e2d724cefe..a3bd6b600c9 100644
--- a/source/gameengine/Rasterizer/RAS_Polygon.h
+++ b/source/gameengine/Rasterizer/RAS_Polygon.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_POLYGON
-#define __RAS_POLYGON
+#ifndef __RAS_POLYGON_H__
+#define __RAS_POLYGON_H__
 
 #include "RAS_TexVert.h"
 #include "RAS_MaterialBucket.h"
diff --git a/source/gameengine/Rasterizer/RAS_Rect.h b/source/gameengine/Rasterizer/RAS_Rect.h
index d307a1f62ee..c845c2c21bd 100644
--- a/source/gameengine/Rasterizer/RAS_Rect.h
+++ b/source/gameengine/Rasterizer/RAS_Rect.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef _RAS_RECT
-#define _RAS_RECT
+#ifndef __RAS_RECT_H__
+#define __RAS_RECT_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -102,5 +102,5 @@ public:
 #endif
 };
 
-#endif // _RAS_RECT
+#endif // __RAS_RECT_H__
 
diff --git a/source/gameengine/Rasterizer/RAS_TexMatrix.h b/source/gameengine/Rasterizer/RAS_TexMatrix.h
index 125e8596ad2..44ae1b0eb5d 100644
--- a/source/gameengine/Rasterizer/RAS_TexMatrix.h
+++ b/source/gameengine/Rasterizer/RAS_TexMatrix.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RASTEXMATRIX
-#define __RASTEXMATRIX
+#ifndef __RAS_TEXMATRIX_H__
+#define __RAS_TEXMATRIX_H__
 
 #include "MT_Matrix3x3.h"
 #include "MT_Point3.h"
@@ -39,5 +39,5 @@
 
 void RAS_CalcTexMatrix(RAS_TexVert p[3],MT_Point3& origin,MT_Vector3& udir,MT_Vector3& vdir);
 
-#endif //__RASTEXMATRIX
+#endif //__RAS_TEXMATRIX_H__
 
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.h b/source/gameengine/Rasterizer/RAS_TexVert.h
index 64ebb53baa2..f76c6a66c86 100644
--- a/source/gameengine/Rasterizer/RAS_TexVert.h
+++ b/source/gameengine/Rasterizer/RAS_TexVert.h
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_TEXVERT
-#define __RAS_TEXVERT
+#ifndef __RAS_TEXVERT_H__
+#define __RAS_TEXVERT_H__
 
 
 #include "MT_Point3.h"
@@ -149,5 +149,5 @@ public:
 #endif
 };
 
-#endif //__RAS_TEXVERT
+#endif //__RAS_TEXVERT_H__
 
diff --git a/source/gameengine/SceneGraph/SG_Controller.h b/source/gameengine/SceneGraph/SG_Controller.h
index dd4ed0755cb..f6361d2c992 100644
--- a/source/gameengine/SceneGraph/SG_Controller.h
+++ b/source/gameengine/SceneGraph/SG_Controller.h
@@ -32,8 +32,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_CONTROLLER_H
-#define __SG_CONTROLLER_H
+#ifndef __SG_CONTROLLER_H__
+#define __SG_CONTROLLER_H__
 
 #include "SG_IObject.h"
 
@@ -124,5 +124,5 @@ protected:
 
 };
 
-#endif //__SG_CONTROLLER_H
+#endif //__SG_CONTROLLER_H__
 
diff --git a/source/gameengine/SceneGraph/SG_DList.h b/source/gameengine/SceneGraph/SG_DList.h
index c4c71ca859f..90e3226f227 100644
--- a/source/gameengine/SceneGraph/SG_DList.h
+++ b/source/gameengine/SceneGraph/SG_DList.h
@@ -29,8 +29,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_DLIST
-#define __SG_DLIST
+#ifndef __SG_DLIST_H__
+#define __SG_DLIST_H__
 
 #include <stdlib.h>
 
@@ -250,5 +250,5 @@ public:
 
 };
 
-#endif //__SG_DLIST
+#endif //__SG_DLIST_H__
 
diff --git a/source/gameengine/SceneGraph/SG_IObject.h b/source/gameengine/SceneGraph/SG_IObject.h
index 764d92b6fd1..df14631d0d9 100644
--- a/source/gameengine/SceneGraph/SG_IObject.h
+++ b/source/gameengine/SceneGraph/SG_IObject.h
@@ -29,8 +29,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_IOBJECT
-#define __SG_IOBJECT
+#ifndef __SG_IOBJECT_H__
+#define __SG_IOBJECT_H__
 
 #include "SG_QList.h"
 #include <vector>
@@ -373,5 +373,5 @@ public:
 #endif
 };
 
-#endif //__SG_IOBJECT
+#endif //__SG_IOBJECT_H__
 
diff --git a/source/gameengine/SceneGraph/SG_Node.h b/source/gameengine/SceneGraph/SG_Node.h
index ad4c35198f8..d1991537cf9 100644
--- a/source/gameengine/SceneGraph/SG_Node.h
+++ b/source/gameengine/SceneGraph/SG_Node.h
@@ -29,8 +29,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_NODE_H
-#define __SG_NODE_H
+#ifndef __SG_NODE_H__
+#define __SG_NODE_H__
 
 #include "SG_Spatial.h"
 #include <vector>
@@ -277,5 +277,5 @@ public:
 #endif
 };
 
-#endif //__SG_NODE_H
+#endif //__SG_NODE_H__
 
diff --git a/source/gameengine/SceneGraph/SG_ParentRelation.h b/source/gameengine/SceneGraph/SG_ParentRelation.h
index c704146160c..07f11c87a36 100644
--- a/source/gameengine/SceneGraph/SG_ParentRelation.h
+++ b/source/gameengine/SceneGraph/SG_ParentRelation.h
@@ -49,8 +49,8 @@
  *
  */
  
-#ifndef __SG_ParentRelation_h
-#define __SG_ParentRelation_h
+#ifndef __SG_PARENTRELATION_H__
+#define __SG_PARENTRELATION_H__
 
 class SG_Spatial;
 
diff --git a/source/gameengine/SceneGraph/SG_QList.h b/source/gameengine/SceneGraph/SG_QList.h
index 9df8f35f3a4..e1288877b1d 100644
--- a/source/gameengine/SceneGraph/SG_QList.h
+++ b/source/gameengine/SceneGraph/SG_QList.h
@@ -29,8 +29,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_QLIST
-#define __SG_QLIST
+#ifndef __SG_QLIST_H__
+#define __SG_QLIST_H__
 
 #include "SG_DList.h"
 
@@ -163,5 +163,5 @@ public:
 #endif
 };
 
-#endif //__SG_QLIST
+#endif //__SG_QLIST_H__
 
diff --git a/source/gameengine/SceneGraph/SG_Spatial.h b/source/gameengine/SceneGraph/SG_Spatial.h
index 3f2f66c0e1c..085c2d12267 100644
--- a/source/gameengine/SceneGraph/SG_Spatial.h
+++ b/source/gameengine/SceneGraph/SG_Spatial.h
@@ -29,8 +29,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_SPATIAL_H
-#define __SG_SPATIAL_H
+#ifndef __SG_SPATIAL_H__
+#define __SG_SPATIAL_H__
 
 #include <MT_Vector3.h>
 #include <MT_Point3.h>
@@ -293,5 +293,5 @@ public:
 #endif
 };
 
-#endif //__SG_SPATIAL_H
+#endif //__SG_SPATIAL_H__
 
-- 
cgit v1.2.3