diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index 01baf8feb2a..d7d75b4c4c9 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -92,4 +92,4 @@ extern int slurph_opt;
 };
 #endif
 
-#endif // __BKE_KEY_H__
+#endif  /* __BKE_KEY_H__ */
diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h
index 82a791348dd..8fa20eb2cc2 100644
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@ -116,5 +116,4 @@ void multires_topology_changed(struct Mesh *me);
 void old_mdisps_bilinear(float out[3], float (*disps)[3], const int st, float u, float v);
 int mdisp_rot_face_to_crn(const int corners, const int face_side, const float u, const float v, float *x, float *y);
 
-#endif // __BKE_MULTIRES_H__
-
+#endif  /* __BKE_MULTIRES_H__ */
diff --git a/source/blender/blenkernel/BKE_navmesh_conversion.h b/source/blender/blenkernel/BKE_navmesh_conversion.h
index aab359b307a..cc9c18c764d 100644
--- a/source/blender/blenkernel/BKE_navmesh_conversion.h
+++ b/source/blender/blenkernel/BKE_navmesh_conversion.h
@@ -60,4 +60,4 @@ int polyFindVertex(const unsigned short *p, const int vertsPerPoly, unsigned sho
 float distPointToSegmentSq(const float *point, const float *a, const float *b);
 
 
-#endif //NAVMESH_CONVERSION_H
+#endif  /* NAVMESH_CONVERSION_H */
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h
index 63f5ec59a0b..06f8b89ec05 100644
--- a/source/blender/blenkernel/BKE_utildefines.h
+++ b/source/blender/blenkernel/BKE_utildefines.h
@@ -38,4 +38,4 @@ extern "C" {
 }
 #endif
 
-#endif // __BKE_UTILDEFINES_H__
+#endif  /* __BKE_UTILDEFINES_H__ */
diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h
index 941a74ec2ab..f068c4c58f0 100644
--- a/source/blender/blenkernel/nla_private.h
+++ b/source/blender/blenkernel/nla_private.h
@@ -85,4 +85,4 @@ NlaEvalStrip *nlastrips_ctime_get_strip(ListBase *list, ListBase *strips, short
 void nlastrip_evaluate(PointerRNA *ptr, ListBase *channels, ListBase *modifiers, NlaEvalStrip *nes);
 void nladata_flush_channels(ListBase *channels);
 
-#endif // __NLA_PRIVATE_H__
+#endif  /* __NLA_PRIVATE_H__ */
diff --git a/source/blender/blenlib/BLI_bpath.h b/source/blender/blenlib/BLI_bpath.h
index 52b839d11a9..a86b362c271 100644
--- a/source/blender/blenlib/BLI_bpath.h
+++ b/source/blender/blenlib/BLI_bpath.h
@@ -64,4 +64,4 @@ void BLI_bpath_missing_files_find(struct Main *bmain, const char *searchpath, st
 void BLI_bpath_relative_convert(struct Main *bmain, const char *basedir, struct ReportList *reports);
 void BLI_bpath_absolute_convert(struct Main *bmain, const char *basedir, struct ReportList *reports);
 
-#endif // __BLI_BPATH_H__
+#endif  /* __BLI_BPATH_H__ */
diff --git a/source/blender/blenlib/BLI_dlrbTree.h b/source/blender/blenlib/BLI_dlrbTree.h
index 92356b24403..d04e544376a 100644
--- a/source/blender/blenlib/BLI_dlrbTree.h
+++ b/source/blender/blenlib/BLI_dlrbTree.h
@@ -158,4 +158,4 @@ void BLI_dlrbTree_insert(DLRBT_Tree *tree, DLRBT_Node *node);
 
 /* ********************************************** */
 
-#endif // __BLI_DLRBTREE_H__
+#endif  /* __BLI_DLRBTREE_H__ */
diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h
index 985b5af3b94..c75334a2924 100644
--- a/source/blender/blenlib/BLI_kdopbvh.h
+++ b/source/blender/blenlib/BLI_kdopbvh.h
@@ -113,5 +113,4 @@ int BLI_bvhtree_range_query(BVHTree *tree, const float co[3], float radius, BVHT
 }
 #endif
 
-#endif // __BLI_KDOPBVH_H__
-
+#endif  /* __BLI_KDOPBVH_H__ */
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
index 5321de4393b..beb554042ea 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -330,4 +330,4 @@
 #  define UNLIKELY(x)     (x)
 #endif
 
-#endif // __BLI_UTILDEFINES_H__
+#endif  /* __BLI_UTILDEFINES_H__ */
diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h
index e8fd936e749..468a95ed434 100644
--- a/source/blender/compositor/intern/COM_Node.h
+++ b/source/blender/compositor/intern/COM_Node.h
@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_Node_h
-#define _COM_Node_h
+#ifndef __COM_NODE_H__
+#define __COM_NODE_H__
 
 #include "COM_NodeBase.h"
 #include "COM_InputSocket.h"
@@ -152,4 +152,4 @@ protected:
 private:
 };
 
-#endif
+#endif  /* __COM_NODE_H__ */
diff --git a/source/blender/compositor/intern/COM_NodeBase.h b/source/blender/compositor/intern/COM_NodeBase.h
index 64d669b5e9a..e386b5e08a0 100644
--- a/source/blender/compositor/intern/COM_NodeBase.h
+++ b/source/blender/compositor/intern/COM_NodeBase.h
@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_NodeBase_h
-#define _COM_NodeBase_h
+#ifndef __COM_NODEBASE_H__
+#define __COM_NODEBASE_H__
 
 #include "COM_InputSocket.h"
 #include "COM_OutputSocket.h"
@@ -166,4 +166,4 @@ protected:
 #endif
 };
 
-#endif
+#endif  /* __COM_NODEBASE_H__ */
diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.h b/source/blender/compositor/nodes/COM_ChannelMatteNode.h
index 4efb06c9f87..29c6000a245 100644
--- a/source/blender/compositor/nodes/COM_ChannelMatteNode.h
+++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.h
@@ -34,4 +34,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ChannelMatteNODE_H
+#endif  /* COM_ChannelMatteNODE_H */
diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.h b/source/blender/compositor/nodes/COM_ChromaMatteNode.h
index ddd350aab40..bf5302ccdbb 100644
--- a/source/blender/compositor/nodes/COM_ChromaMatteNode.h
+++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.h
@@ -34,4 +34,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ChromaMatteNODE_H
+#endif  /* COM_ChromaMatteNODE_H */
diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.h b/source/blender/compositor/nodes/COM_ColorBalanceNode.h
index cdad02fc831..30d22ef2e63 100644
--- a/source/blender/compositor/nodes/COM_ColorBalanceNode.h
+++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.h
@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ColorBalanceNODE_H
+#endif  /* COM_ColorBalanceNODE_H */
diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.h b/source/blender/compositor/nodes/COM_ColorMatteNode.h
index 92a4fa79408..3386476bc85 100644
--- a/source/blender/compositor/nodes/COM_ColorMatteNode.h
+++ b/source/blender/compositor/nodes/COM_ColorMatteNode.h
@@ -34,4 +34,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ColorMatteNODE_H
+#endif  /* COM_ColorMatteNODE_H */
diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.h b/source/blender/compositor/nodes/COM_ColorRampNode.h
index 6c256c09e68..3f00e1c2190 100644
--- a/source/blender/compositor/nodes/COM_ColorRampNode.h
+++ b/source/blender/compositor/nodes/COM_ColorRampNode.h
@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ColorRampNODE_H
+#endif  /* COM_ColorRampNODE_H */
diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.h b/source/blender/compositor/nodes/COM_ColorSpillNode.h
index 1d976fc65ae..01722fac826 100644
--- a/source/blender/compositor/nodes/COM_ColorSpillNode.h
+++ b/source/blender/compositor/nodes/COM_ColorSpillNode.h
@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ColorSpillNODE_H
+#endif  /* COM_ColorSpillNODE_H */
diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
index 191b7361c3c..0b571889571 100644
--- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
+++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_DifferenceMatteNODE_H
+#endif  /* COM_DifferenceMatteNODE_H */
diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.h b/source/blender/compositor/nodes/COM_DistanceMatteNode.h
index 4e6682424e8..46ceae7c4f4 100644
--- a/source/blender/compositor/nodes/COM_DistanceMatteNode.h
+++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.h
@@ -34,4 +34,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_DistanceMatteNODE_H
+#endif  /* COM_DistanceMatteNODE_H */
diff --git a/source/blender/compositor/nodes/COM_FilterNode.h b/source/blender/compositor/nodes/COM_FilterNode.h
index d65166944d8..9be3bb02494 100644
--- a/source/blender/compositor/nodes/COM_FilterNode.h
+++ b/source/blender/compositor/nodes/COM_FilterNode.h
@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_FilterNode_h_
-#define _COM_FilterNode_h_
+#ifndef __COM_FILTERNODE_H__
+#define __COM_FILTERNODE_H__
 
 #include "COM_Node.h"
 
@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // _COM_FilterNode_h_
+#endif  /* __COM_FILTERNODE_H__ */
diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.h b/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
index 37f3c31113f..a71e68cf636 100644
--- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
+++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
@@ -19,8 +19,8 @@
  *		Dalai Felinto
  */
 
-#ifndef _COM_LuminanceMatteNode_h_
-#define _COM_LuminanceMatteNode_h_
+#ifndef __COM_LUMINANCEMATTENODE_H__
+#define __COM_LUMINANCEMATTENODE_H__
 
 #include "COM_Node.h"
 
@@ -34,4 +34,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // _COM_LuminanceMatteNode_h_
+#endif  /* __COM_LUMINANCEMATTENODE_H__ */
diff --git a/source/blender/compositor/nodes/COM_MapValueNode.h b/source/blender/compositor/nodes/COM_MapValueNode.h
index 22aa5459ec0..bd8e3d08e9c 100644
--- a/source/blender/compositor/nodes/COM_MapValueNode.h
+++ b/source/blender/compositor/nodes/COM_MapValueNode.h
@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_MapValueNode_h_
-#define _COM_MapValueNode_h_
+#ifndef __COM_MAPVALUENODE_H__
+#define __COM_MAPVALUENODE_H__
 
 #include "COM_Node.h"
 #include "DNA_node_types.h"
@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // _COM_MapValueNode_h_
+#endif  /* __COM_MAPVALUENODE_H__ */
diff --git a/source/blender/compositor/nodes/COM_MaskNode.h b/source/blender/compositor/nodes/COM_MaskNode.h
index cdd5d3c362e..9ef3e5deb50 100644
--- a/source/blender/compositor/nodes/COM_MaskNode.h
+++ b/source/blender/compositor/nodes/COM_MaskNode.h
@@ -21,8 +21,8 @@
  *		Sergey Sharybin
  */
 
-#ifndef _COM_MaskNode_h_
-#define _COM_MaskNode_h_
+#ifndef __COM_MASKNODE_H__
+#define __COM_MASKNODE_H__
 
 #include "COM_Node.h"
 #include "DNA_node_types.h"
@@ -38,4 +38,4 @@ public:
 
 };
 
-#endif // _COM_MaskNode_h_
+#endif  /* __COM_MASKNODE_H__ */
diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.h b/source/blender/compositor/nodes/COM_MovieClipNode.h
index 52ea11ea8e9..2fb38860a34 100644
--- a/source/blender/compositor/nodes/COM_MovieClipNode.h
+++ b/source/blender/compositor/nodes/COM_MovieClipNode.h
@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_MovieClipNode_h_
-#define _COM_MovieClipNode_h_
+#ifndef __COM_MOVIECLIPNODE_H__
+#define __COM_MOVIECLIPNODE_H__
 
 #include "COM_Node.h"
 #include "DNA_node_types.h"
@@ -36,4 +36,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // _COM_MovieClipNode_h_
+#endif  /* __COM_MOVIECLIPNODE_H__ */
diff --git a/source/blender/compositor/nodes/COM_NormalNode.h b/source/blender/compositor/nodes/COM_NormalNode.h
index 660d90040bd..64d4e3a3656 100644
--- a/source/blender/compositor/nodes/COM_NormalNode.h
+++ b/source/blender/compositor/nodes/COM_NormalNode.h
@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_NormalNODE_H
+#endif  /* COM_NormalNODE_H */
diff --git a/source/blender/compositor/nodes/COM_TransformNode.h b/source/blender/compositor/nodes/COM_TransformNode.h
index 57a7a0229ec..666f2da775e 100644
--- a/source/blender/compositor/nodes/COM_TransformNode.h
+++ b/source/blender/compositor/nodes/COM_TransformNode.h
@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_TransformNode_h_
-#define _COM_TransformNode_h_
+#ifndef __COM_TRANSFORMNODE_H__
+#define __COM_TRANSFORMNODE_H__
 
 #include "COM_Node.h"
 #include "DNA_node_types.h"
@@ -36,4 +36,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // _COM_TransformNode_h_
+#endif  /* __COM_TRANSFORMNODE_H__ */
diff --git a/source/blender/editors/animation/anim_intern.h b/source/blender/editors/animation/anim_intern.h
index bc07bf091de..54c7f7ea30f 100644
--- a/source/blender/editors/animation/anim_intern.h
+++ b/source/blender/editors/animation/anim_intern.h
@@ -82,4 +82,4 @@ void ANIM_OT_driver_button_remove(struct wmOperatorType *ot);
 void ANIM_OT_copy_driver_button(struct wmOperatorType *ot);
 void ANIM_OT_paste_driver_button(struct wmOperatorType *ot);
 
-#endif // __ANIM_INTERN_H__
+#endif  /* __ANIM_INTERN_H__ */
diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h
index 8a65699f404..ffee46e30c6 100644
--- a/source/blender/editors/include/ED_keyframes_draw.h
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -157,4 +157,3 @@ short compare_ab_cfraPtr(void *node, void *data);
 short actkeyblock_is_valid(ActKeyBlock *ab, struct DLRBT_Tree *keys);
 
 #endif  /*  __ED_KEYFRAMES_DRAW_H__ */
-
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h
index de594b87e2c..2676316c66d 100644
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@ -221,5 +221,4 @@ void MESH_OT_navmesh_face_add(struct wmOperatorType *ot);
 void MESH_OT_navmesh_reset(struct wmOperatorType *ot);
 void MESH_OT_navmesh_clear(struct wmOperatorType *ot);
 
-#endif // __MESH_INTERN_H__
-
+#endif  /* __MESH_INTERN_H__ */
diff --git a/source/blender/ikplugin/BIK_api.h b/source/blender/ikplugin/BIK_api.h
index e1d5f50edfb..4fc273bd435 100644
--- a/source/blender/ikplugin/BIK_api.h
+++ b/source/blender/ikplugin/BIK_api.h
@@ -92,5 +92,4 @@ void BIK_test_constraint(struct Object *ob, struct bConstraint *cons);
 }
 #endif
 
-#endif // __BIK_API_H__
-
+#endif  /* __BIK_API_H__ */
diff --git a/source/blender/ikplugin/intern/ikplugin_api.h b/source/blender/ikplugin/intern/ikplugin_api.h
index 77c962269dc..53d9da8e614 100644
--- a/source/blender/ikplugin/intern/ikplugin_api.h
+++ b/source/blender/ikplugin/intern/ikplugin_api.h
@@ -60,5 +60,4 @@ typedef struct IKPlugin IKPlugin;
 }
 #endif
 
-#endif // __IKPLUGIN_API_H__
-
+#endif  /* __IKPLUGIN_API_H__ */
diff --git a/source/blender/ikplugin/intern/iksolver_plugin.h b/source/blender/ikplugin/intern/iksolver_plugin.h
index dd00c5f4add..c2ae4f937e7 100644
--- a/source/blender/ikplugin/intern/iksolver_plugin.h
+++ b/source/blender/ikplugin/intern/iksolver_plugin.h
@@ -47,5 +47,4 @@ void iksolver_execute_tree(struct Scene *scene, struct Object *ob,  struct bPose
 }
 #endif
 
-#endif // __IKSOLVER_PLUGIN_H__
-
+#endif  /* __IKSOLVER_PLUGIN_H__ */
diff --git a/source/blender/ikplugin/intern/itasc_plugin.h b/source/blender/ikplugin/intern/itasc_plugin.h
index 0d5fde0bec0..0500125b4c7 100644
--- a/source/blender/ikplugin/intern/itasc_plugin.h
+++ b/source/blender/ikplugin/intern/itasc_plugin.h
@@ -52,5 +52,4 @@ void itasc_test_constraint(struct Object *ob, struct bConstraint *cons);
 }
 #endif
 
-#endif // __ITASC_PLUGIN_H__
-
+#endif  /* __ITASC_PLUGIN_H__ */
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h
index f03f709f13f..76c247b2195 100644
--- a/source/blender/imbuf/IMB_imbuf_types.h
+++ b/source/blender/imbuf/IMB_imbuf_types.h
@@ -242,7 +242,7 @@ typedef struct ImBuf {
 	((unsigned long)(unsigned char)(ch1) << 8) | \
 	((unsigned long)(unsigned char)(ch2) << 16) | \
 	((unsigned long)(unsigned char)(ch3) << 24))
-#endif //MAKEFOURCC
+#endif  /* MAKEFOURCC */
 
 /*
  * FOURCC codes for DX compressed-texture pixel formats
@@ -255,7 +255,7 @@ typedef struct ImBuf {
 #define FOURCC_DXT4  (MAKEFOURCC('D','X','T','4'))
 #define FOURCC_DXT5  (MAKEFOURCC('D','X','T','5'))
 
-#endif // DDS
+#endif  /* DDS */
 extern const char *imb_ext_image[];
 extern const char *imb_ext_image_qt[];
 extern const char *imb_ext_movie[];
diff --git a/source/blender/imbuf/intern/dds/BlockDXT.h b/source/blender/imbuf/intern/dds/BlockDXT.h
index c6712f4f058..9b90b744b67 100644
--- a/source/blender/imbuf/intern/dds/BlockDXT.h
+++ b/source/blender/imbuf/intern/dds/BlockDXT.h
@@ -271,4 +271,4 @@ void mem_read(Stream & mem, BlockATI1 & block);
 void mem_read(Stream & mem, BlockATI2 & block);
 void mem_read(Stream & mem, BlockCTX1 & block);
 
-#endif // __BLOCKDXT_H__
+#endif  /* __BLOCKDXT_H__ */
diff --git a/source/blender/imbuf/intern/dds/Color.h b/source/blender/imbuf/intern/dds/Color.h
index 17de0a596c6..6676057d710 100644
--- a/source/blender/imbuf/intern/dds/Color.h
+++ b/source/blender/imbuf/intern/dds/Color.h
@@ -96,4 +96,4 @@ public:
 	};
 };
 
-#endif // __COLOR_H__
+#endif  /* __COLOR_H__ */
diff --git a/source/blender/imbuf/intern/dds/ColorBlock.h b/source/blender/imbuf/intern/dds/ColorBlock.h
index 2bf362f2780..f0864f06e6f 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.h
+++ b/source/blender/imbuf/intern/dds/ColorBlock.h
@@ -104,4 +104,4 @@ inline Color32 & ColorBlock::color(uint x, uint y)
 	return m_color[y * 4 + x];
 }
 
-#endif // __COLORBLOCK_H__
+#endif  /* __COLORBLOCK_H__ */
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
index a851533b1f3..ccac1c08b41 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
@@ -200,4 +200,4 @@ void mem_read(Stream & mem, DDSCaps & caps);
 void mem_read(Stream & mem, DDSHeader & header);
 void mem_read(Stream & mem, DDSHeader10 & header);
 
-#endif // __DIRECTDRAWSURFACE_H__
+#endif  /* __DIRECTDRAWSURFACE_H__ */
diff --git a/source/blender/imbuf/intern/dds/Image.h b/source/blender/imbuf/intern/dds/Image.h
index 5dcf3011c76..81074fba6b7 100644
--- a/source/blender/imbuf/intern/dds/Image.h
+++ b/source/blender/imbuf/intern/dds/Image.h
@@ -101,4 +101,4 @@ inline Color32 & Image::pixel(uint x, uint y)
 	return pixel(y * width() + x);
 }
 
-#endif // __IMAGE_H__
+#endif  /* __IMAGE_H__ */
diff --git a/source/blender/imbuf/intern/dds/PixelFormat.h b/source/blender/imbuf/intern/dds/PixelFormat.h
index 308ea810f03..ce36fb00b97 100644
--- a/source/blender/imbuf/intern/dds/PixelFormat.h
+++ b/source/blender/imbuf/intern/dds/PixelFormat.h
@@ -135,4 +135,4 @@
 
 	} // PixelFormat namespace
 
-#endif // _DDS_IMAGE_PIXELFORMAT_H
+#endif  /* __PIXELFORMAT_H__ */
diff --git a/source/blender/imbuf/intern/dds/Stream.h b/source/blender/imbuf/intern/dds/Stream.h
index 9f513ca8aba..7fed4ca89e7 100644
--- a/source/blender/imbuf/intern/dds/Stream.h
+++ b/source/blender/imbuf/intern/dds/Stream.h
@@ -45,5 +45,4 @@ unsigned int mem_read(Stream & mem, unsigned short & i);
 unsigned int mem_read(Stream & mem, unsigned char & i);
 unsigned int mem_read(Stream & mem, unsigned char *i, unsigned int cnt);
 
-#endif // __STREAM_H__
-
+#endif  /* __STREAM_H__ */
diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h
index bf388d8c018..5b25d1a072c 100644
--- a/source/blender/makesdna/DNA_mask_types.h
+++ b/source/blender/makesdna/DNA_mask_types.h
@@ -211,4 +211,4 @@ enum {
 	MASK_ANIMF_EXPAND = (1 << 4)
 };
 
-#endif // __DNA_MASK_TYPES_H__
+#endif  /* __DNA_MASK_TYPES_H__ */
diff --git a/source/blender/modifiers/MOD_modifiertypes.h b/source/blender/modifiers/MOD_modifiertypes.h
index bf411c3b2fc..51e574e276d 100644
--- a/source/blender/modifiers/MOD_modifiertypes.h
+++ b/source/blender/modifiers/MOD_modifiertypes.h
@@ -79,4 +79,4 @@ extern ModifierTypeInfo modifierType_Skin;
 /* MOD_util.c */
 void modifier_type_init(ModifierTypeInfo *types[]);
 
-#endif //__MOD_MODIFIERTYPES_H__
+#endif  /* __MOD_MODIFIERTYPES_H__ */
diff --git a/source/blender/modifiers/intern/MOD_boolean_util.h b/source/blender/modifiers/intern/MOD_boolean_util.h
index b996dc6d6ba..209db60f0c9 100644
--- a/source/blender/modifiers/intern/MOD_boolean_util.h
+++ b/source/blender/modifiers/intern/MOD_boolean_util.h
@@ -51,4 +51,4 @@ int NewBooleanMesh(struct Scene *scene, struct Base *base, struct Base *base_sel
 struct DerivedMesh *NewBooleanDerivedMesh(struct DerivedMesh *dm, struct Object *ob,
                                           struct DerivedMesh *dm_select, struct Object *ob_select, int int_op_type);
 
-#endif // MOD_BOOLEAN_UTILS
+#endif  /* MOD_BOOLEAN_UTILS */
diff --git a/source/blender/python/generic/py_capi_utils.h b/source/blender/python/generic/py_capi_utils.h
index 481cfb17c7a..935a5f9030b 100644
--- a/source/blender/python/generic/py_capi_utils.h
+++ b/source/blender/python/generic/py_capi_utils.h
@@ -69,4 +69,4 @@ int       PyC_FlagSet_ValueFromID(PyC_FlagSet *item, const char *identifier, int
 int       PyC_FlagSet_ToBitfield(PyC_FlagSet *items, PyObject *value, int *r_value, const char *error_prefix);
 PyObject *PyC_FlagSet_FromBitfield(PyC_FlagSet *items, int flag);
 
-#endif // __PY_CAPI_UTILS_H__
+#endif  /* __PY_CAPI_UTILS_H__ */
diff --git a/source/blender/python/intern/bpy_app.h b/source/blender/python/intern/bpy_app.h
index 5bf36f04ba0..226bf44a493 100644
--- a/source/blender/python/intern/bpy_app.h
+++ b/source/blender/python/intern/bpy_app.h
@@ -29,4 +29,4 @@
 
 PyObject *BPY_app_struct(void);
 
-#endif // __BPY_APP_H__
+#endif  /* __BPY_APP_H__ */
diff --git a/source/blender/python/intern/bpy_app_ffmpeg.h b/source/blender/python/intern/bpy_app_ffmpeg.h
index cadbb021d31..26d6e13f8f4 100644
--- a/source/blender/python/intern/bpy_app_ffmpeg.h
+++ b/source/blender/python/intern/bpy_app_ffmpeg.h
@@ -29,4 +29,4 @@
 
 PyObject *BPY_app_ffmpeg_struct(void);
 
-#endif // __BPY_APP_FFMPEG_H__
+#endif  /* __BPY_APP_FFMPEG_H__ */
diff --git a/source/blender/python/intern/bpy_app_handlers.h b/source/blender/python/intern/bpy_app_handlers.h
index 1f1eaf04a8b..40ca43909ed 100644
--- a/source/blender/python/intern/bpy_app_handlers.h
+++ b/source/blender/python/intern/bpy_app_handlers.h
@@ -29,4 +29,4 @@
 
 PyObject *BPY_app_handlers_struct(void);
 
-#endif // __BPY_APP_HANDLERS_H__
+#endif /* __BPY_APP_HANDLERS_H__ */
diff --git a/source/blender/python/intern/bpy_driver.h b/source/blender/python/intern/bpy_driver.h
index 6d1696d6cdc..1fccec7e1b2 100644
--- a/source/blender/python/intern/bpy_driver.h
+++ b/source/blender/python/intern/bpy_driver.h
@@ -36,4 +36,4 @@ extern PyObject *bpy_pydriver_Dict;
 float BPY_driver_exec(struct ChannelDriver *driver, const float evaltime);
 void BPY_driver_reset(void);
 
-#endif // __BPY_DRIVER_H__
+#endif  /* __BPY_DRIVER_H__ */
diff --git a/source/blender/python/intern/bpy_traceback.h b/source/blender/python/intern/bpy_traceback.h
index 575f9824379..9ac49c370e4 100644
--- a/source/blender/python/intern/bpy_traceback.h
+++ b/source/blender/python/intern/bpy_traceback.h
@@ -28,4 +28,4 @@
 
 void python_script_error_jump(const char *filepath, int *lineno, int *offset);
 
-#endif // __BPY_TRACEBACK_H__
+#endif  /* __BPY_TRACEBACK_H__ */
diff --git a/source/blender/python/mathutils/mathutils_noise.h b/source/blender/python/mathutils/mathutils_noise.h
index f4bec88e59a..2ed3e32f4f1 100644
--- a/source/blender/python/mathutils/mathutils_noise.h
+++ b/source/blender/python/mathutils/mathutils_noise.h
@@ -33,4 +33,4 @@ PyMODINIT_FUNC PyInit_mathutils_noise(void);
 PyMODINIT_FUNC PyInit_mathutils_noise_types(void);
 PyMODINIT_FUNC PyInit_mathutils_noise_metrics(void);
 
-#endif // __MATHUTILS_NOISE_H__
+#endif /* __MATHUTILS_NOISE_H__ */
diff --git a/source/blender/quicktime/quicktime_export.h b/source/blender/quicktime/quicktime_export.h
index ed896357c90..cef4cb8c2a6 100644
--- a/source/blender/quicktime/quicktime_export.h
+++ b/source/blender/quicktime/quicktime_export.h
@@ -164,6 +164,6 @@ enum {
 };
 #endif
 
-#endif //(_WIN32) || (__APPLE__)
+#endif /* (_WIN32) || (__APPLE__) */
 
-#endif  // __QUICKTIME_IMP_H__
+#endif  /* __QUICKTIME_IMP_H__ */
diff --git a/source/blender/quicktime/quicktime_import.h b/source/blender/quicktime/quicktime_import.h
index 19bdbb4814c..fb068fc2533 100644
--- a/source/blender/quicktime/quicktime_import.h
+++ b/source/blender/quicktime/quicktime_import.h
@@ -51,8 +51,8 @@
 #import <Carbon/Carbon.h>
 #include <QuickTime/Movies.h>
 #endif
-#endif //__MOVIES__
-#endif //USE_QTKIT
+#endif  /* __MOVIES__ */
+#endif  /* USE_QTKIT */
 
 #ifdef _WIN32
 #ifndef __FIXMATH__
@@ -76,4 +76,4 @@ ImBuf  *qtime_fetchibuf (struct anim *anim, int position);
 int		imb_is_a_quicktime (char *name);
 ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags);
 
-#endif  // __QUICKTIME_IMPORT_H__
+#endif  /* __QUICKTIME_IMPORT_H__ */
diff --git a/source/blender/render/intern/raytrace/svbvh.h b/source/blender/render/intern/raytrace/svbvh.h
index a58094e5021..2f4a337f0f9 100644
--- a/source/blender/render/intern/raytrace/svbvh.h
+++ b/source/blender/render/intern/raytrace/svbvh.h
@@ -29,12 +29,11 @@
  *  \ingroup render
  */
 
-
-#ifdef __SSE__
- 
 #ifndef __SVBVH_H__
 #define __SVBVH_H__
 
+#ifdef __SSE__
+
 #include "bvh.h"
 #include "BLI_memarena.h"
 #include "BKE_global.h"
@@ -311,7 +310,6 @@ struct Reorganize_SVBVH {
 	}	
 };
 
-#endif
-
-#endif //__SSE__
+#endif  /* __SSE__ */
 
+#endif  /* __SVBVH_H__ */
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
index 004f7dd0dd9..bbec7e0fada 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
@@ -201,5 +201,4 @@ private:
 #endif
 };
 
-#endif // __KX_BLENDERCANVAS_H__
-
+#endif  /* __KX_BLENDERCANVAS_H__ */
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.h b/source/gameengine/BlenderRoutines/KX_BlenderGL.h
index 3b89538df47..7ba612b19cf 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderGL.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.h
@@ -34,7 +34,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif //__cplusplus
+#endif  /* __cplusplus */
 
 struct wmWindow;
 struct ARegion;
@@ -58,7 +58,6 @@ void BL_print_gamedebug_line_padded(const char* text, int xco, int yco, int widt
 
 #ifdef __cplusplus
 }
-#endif //__cplusplus
-
-#endif //__KX_BLENDERGL_H__
+#endif  /* __cplusplus */
 
+#endif  /* __KX_BLENDERGL_H__ */
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
index 43870d9030d..bb476ed497a 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
@@ -75,5 +75,5 @@ public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_BlenderInputDevice")
 #endif
 };
-#endif //__KX_BLENDERINPUTDEVICE_H__
 
+#endif  /* __KX_BLENDERINPUTDEVICE_H__ */
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
index e9140efce01..dec70203ecb 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
@@ -59,5 +59,4 @@ private:
 #endif
 };
 
-#endif //__KX_BLENDERKEYBOARDDEVICE_H__
-
+#endif  /* __KX_BLENDERKEYBOARDDEVICE_H__ */
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
index 0571cafd7a1..8746da83a81 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
@@ -55,5 +55,4 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERMOUSEDEVICE_H__
-
+#endif  /* __KX_BLENDERMOUSEDEVICE_H__ */
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
index 54ff4dde947..17c9f6bfb1a 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
@@ -112,7 +112,4 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERRENDERTOOLS_H__
-
-
-
+#endif  /* __KX_BLENDERRENDERTOOLS_H__ */
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderSystem.h b/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
index a8e033ed47b..0867ef2421f 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
@@ -53,5 +53,4 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERSYSTEM_H__
-
+#endif  /* __KX_BLENDERSYSTEM_H__ */
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h
index 640a9a9ccb7..46075ea933d 100644
--- a/source/gameengine/Converter/BL_ActionActuator.h
+++ b/source/gameengine/Converter/BL_ActionActuator.h
@@ -108,7 +108,7 @@ public:
 				return 1;
 		}
 	}
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 	
 protected:
 	MT_Point3	m_lastpos;
diff --git a/source/gameengine/Converter/BL_ArmatureActuator.h b/source/gameengine/Converter/BL_ArmatureActuator.h
index 0c88dccb6f3..a5af2bc9c09 100644
--- a/source/gameengine/Converter/BL_ArmatureActuator.h
+++ b/source/gameengine/Converter/BL_ArmatureActuator.h
@@ -77,7 +77,7 @@ public:
 	static PyObject *pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 private:
 	// identify the constraint that this actuator controls
@@ -93,6 +93,4 @@ private:
 	int				m_type;
 };
 
-#endif //__BL_ARMATUREACTUATOR_H__
-
-
+#endif  /* __BL_ARMATUREACTUATOR_H__ */
diff --git a/source/gameengine/Converter/BL_ArmatureChannel.h b/source/gameengine/Converter/BL_ArmatureChannel.h
index b764d32e8a7..51114c5df30 100644
--- a/source/gameengine/Converter/BL_ArmatureChannel.h
+++ b/source/gameengine/Converter/BL_ArmatureChannel.h
@@ -68,7 +68,7 @@ public:
 	static int py_attr_setattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 	static PyObject *py_attr_get_joint_rotation(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int py_attr_set_joint_rotation(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 };
 
 /* this is a factory class to access bBone data field in the GE.
@@ -93,6 +93,4 @@ public:
 
 };
 
-
-#endif //__BL_ARMATURECHANNEL_H__
-
+#endif  /* __BL_ARMATURECHANNEL_H__ */
diff --git a/source/gameengine/Converter/BL_ArmatureConstraint.h b/source/gameengine/Converter/BL_ArmatureConstraint.h
index 579153a2e79..98c2954baf4 100644
--- a/source/gameengine/Converter/BL_ArmatureConstraint.h
+++ b/source/gameengine/Converter/BL_ArmatureConstraint.h
@@ -119,8 +119,7 @@ public:
 
 	static PyObject *py_attr_getattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int py_attr_setattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 };
 
-#endif //__BL_ARMATURECONSTRAINT_H__
-
+#endif  /* __BL_ARMATURECONSTRAINT_H__ */
diff --git a/source/gameengine/Converter/BL_ArmatureObject.h b/source/gameengine/Converter/BL_ArmatureObject.h
index 4e7dc3df2f3..445b9af1b10 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.h
+++ b/source/gameengine/Converter/BL_ArmatureObject.h
@@ -120,7 +120,7 @@ public:
 	static PyObject *pyattr_get_channels(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	KX_PYMETHOD_DOC_NOARGS(BL_ArmatureObject, update);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 protected:
 	/* list element: BL_ArmatureConstraint. Use SG_DListHead to have automatic list replication */
@@ -152,6 +152,4 @@ void game_blend_poses(struct bPose *dst, struct bPose *src, float srcweight/*, s
 void game_copy_pose(struct bPose **dst, struct bPose *src, int copy_con);
 void game_free_pose(struct bPose *pose);
 
-
-#endif
-
+#endif  /* __BL_ARMATUREOBJECT_H__ */
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.h b/source/gameengine/Converter/BL_BlenderDataConversion.h
index e6c35c20f4c..2a7efaac898 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.h
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.h
@@ -52,5 +52,4 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 
 SCA_IInputDevice::KX_EnumInputs ConvertKeyCode(int key_code);
 
-#endif // __BL_BLENDERDATACONVERSION_H__
-
+#endif  /* __BL_BLENDERDATACONVERSION_H__ */
diff --git a/source/gameengine/Converter/BL_DeformableGameObject.h b/source/gameengine/Converter/BL_DeformableGameObject.h
index d14160d39a3..6653311d496 100644
--- a/source/gameengine/Converter/BL_DeformableGameObject.h
+++ b/source/gameengine/Converter/BL_DeformableGameObject.h
@@ -34,7 +34,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 #include "DNA_mesh_types.h"
 #include "KX_GameObject.h"
@@ -104,5 +104,4 @@ protected:
 #endif
 };
 
-#endif
-
+#endif  /* __BL_DEFORMABLEGAMEOBJECT_H__ */
diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h
index c84d31c72cd..5cea4100b3f 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.h
+++ b/source/gameengine/Converter/BL_MeshDeformer.h
@@ -40,7 +40,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 class BL_DeformableGameObject;
 
diff --git a/source/gameengine/Converter/BL_ModifierDeformer.h b/source/gameengine/Converter/BL_ModifierDeformer.h
index 5d0c3bc1317..f04b41df3fc 100644
--- a/source/gameengine/Converter/BL_ModifierDeformer.h
+++ b/source/gameengine/Converter/BL_ModifierDeformer.h
@@ -34,7 +34,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 #include "BL_ShapeDeformer.h"
 #include "BL_DeformableGameObject.h"
@@ -111,5 +111,4 @@ protected:
 #endif
 };
 
-#endif
-
+#endif  /* __BL_MODIFIERDEFORMER_H__ */
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.h b/source/gameengine/Converter/BL_ShapeActionActuator.h
index b88631c89d6..f72275b79cf 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.h
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.h
@@ -108,7 +108,7 @@ public:
 
 	}
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 protected:
 
@@ -141,5 +141,4 @@ protected:
 	struct PointerRNA *m_idptr;
 };
 
-#endif
-
+#endif  /* __BL_SHAPEACTIONACTUATOR_H__ */
diff --git a/source/gameengine/Converter/BL_ShapeDeformer.h b/source/gameengine/Converter/BL_ShapeDeformer.h
index ecf501d9a91..ff5d1e33348 100644
--- a/source/gameengine/Converter/BL_ShapeDeformer.h
+++ b/source/gameengine/Converter/BL_ShapeDeformer.h
@@ -34,7 +34,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 #include "BL_SkinDeformer.h"
 #include "BL_DeformableGameObject.h"
diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h
index 48c3c3e6186..f1e1e51dd9b 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.h
+++ b/source/gameengine/Converter/BL_SkinDeformer.h
@@ -34,7 +34,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 #include "CTR_HashedPtr.h"
 #include "BL_MeshDeformer.h"
diff --git a/source/gameengine/Converter/BlenderWorldInfo.h b/source/gameengine/Converter/BlenderWorldInfo.h
index 2cf706a3089..30de5e89269 100644
--- a/source/gameengine/Converter/BlenderWorldInfo.h
+++ b/source/gameengine/Converter/BlenderWorldInfo.h
@@ -104,5 +104,4 @@ 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 980aeef7e60..d828910233f 100644
--- a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
+++ b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
@@ -73,5 +73,4 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERSCALARINTERPOLATOR_H__
-
+#endif  /* __KX_BLENDERSCALARINTERPOLATOR_H__ */
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h
index b51c2f21ca7..436bdb555c9 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.h
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h
@@ -196,5 +196,4 @@ 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 b7c890458cc..596c8cab936 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.h
+++ b/source/gameengine/Converter/KX_ConvertActuators.h
@@ -43,6 +43,4 @@ void BL_ConvertActuators(const char* maggiename,
 	 class RAS_IRenderTools* rendertools, 
 	 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 d1d52f866ec..817a49e1b2f 100644
--- a/source/gameengine/Converter/KX_ConvertControllers.h
+++ b/source/gameengine/Converter/KX_ConvertControllers.h
@@ -43,6 +43,4 @@ void BL_ConvertControllers(
 	class KX_BlenderSceneConverter* converter
 );
 
-
-#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 345af3bfa74..8f96cc21af6 100644
--- a/source/gameengine/Converter/KX_ConvertProperties.h
+++ b/source/gameengine/Converter/KX_ConvertProperties.h
@@ -38,5 +38,4 @@ void BL_ConvertProperties(struct Object* object,
                           class SCA_IScene* scene,
                           bool isInActiveLayer);
 
-#endif //__KX_CONVERTPROPERTIES_H__
-
+#endif  /* __KX_CONVERTPROPERTIES_H__ */
diff --git a/source/gameengine/Converter/KX_ConvertSensors.h b/source/gameengine/Converter/KX_ConvertSensors.h
index 0694815c77e..56248721a37 100644
--- a/source/gameengine/Converter/KX_ConvertSensors.h
+++ b/source/gameengine/Converter/KX_ConvertSensors.h
@@ -42,5 +42,4 @@ void BL_ConvertSensors(struct Object* blenderobject,
 	   class RAS_ICanvas* canvas, 
 	   class KX_BlenderSceneConverter* converter);
 
-#endif //__KX_CONVERTSENSORS_H__
-
+#endif  /* __KX_CONVERTSENSORS_H__ */
diff --git a/source/gameengine/Converter/KX_IpoConvert.h b/source/gameengine/Converter/KX_IpoConvert.h
index 7bb2df978f6..861a2ba66f2 100644
--- a/source/gameengine/Converter/KX_IpoConvert.h
+++ b/source/gameengine/Converter/KX_IpoConvert.h
@@ -66,5 +66,4 @@ 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 d692d45eb18..de533f1c5ed 100644
--- a/source/gameengine/Converter/KX_SoftBodyDeformer.h
+++ b/source/gameengine/Converter/KX_SoftBodyDeformer.h
@@ -34,7 +34,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 #include "RAS_Deformer.h"
 #include "BL_DeformableGameObject.h"
diff --git a/source/gameengine/Expressions/BoolValue.h b/source/gameengine/Expressions/BoolValue.h
index 64ac0266baf..b88c839a58e 100644
--- a/source/gameengine/Expressions/BoolValue.h
+++ b/source/gameengine/Expressions/BoolValue.h
@@ -61,5 +61,4 @@ private:
 #endif
 };
 
-#endif // !defined __BOOLVALUE_H__
-
+#endif  /* __BOOLVALUE_H__ */
diff --git a/source/gameengine/Expressions/ConstExpr.h b/source/gameengine/Expressions/ConstExpr.h
index 86d411cef26..768f2bbd10e 100644
--- a/source/gameengine/Expressions/ConstExpr.h
+++ b/source/gameengine/Expressions/ConstExpr.h
@@ -51,5 +51,4 @@ private:
 #endif
 };
 
-#endif // !defined(AFX_CONSTEXPR_H__061ECFC3_BE87_11D1_A51C_00A02472FC58__INCLUDED_)
-
+#endif  /* __CONSTEXPR_H__ */
diff --git a/source/gameengine/Expressions/EXP_C-Api.h b/source/gameengine/Expressions/EXP_C-Api.h
index 4d43695f9b9..d73b0a209d4 100644
--- a/source/gameengine/Expressions/EXP_C-Api.h
+++ b/source/gameengine/Expressions/EXP_C-Api.h
@@ -64,5 +64,4 @@ const char*					EXP_GetText(EXP_ValueHandle);
 }
 #endif
 
-#endif //__EXP_C_API_H__
-
+#endif  /* __EXP_C_API_H__ */
diff --git a/source/gameengine/Expressions/EmptyValue.h b/source/gameengine/Expressions/EmptyValue.h
index 54920359f3f..8eccb97e0f5 100644
--- a/source/gameengine/Expressions/EmptyValue.h
+++ b/source/gameengine/Expressions/EmptyValue.h
@@ -45,5 +45,4 @@ public:
 #endif
 };
 
-#endif // !defined __EMPTYVALUE_H__
-
+#endif  /* __EMPTYVALUE_H__ */
diff --git a/source/gameengine/Expressions/ErrorValue.h b/source/gameengine/Expressions/ErrorValue.h
index 12bc7c7ffcb..0095528254e 100644
--- a/source/gameengine/Expressions/ErrorValue.h
+++ b/source/gameengine/Expressions/ErrorValue.h
@@ -43,5 +43,4 @@ private:
 #endif
 };
 
-#endif // !defined __ERRORVALUE_H__
-
+#endif  /* __ERRORVALUE_H__ */
diff --git a/source/gameengine/Expressions/Expression.h b/source/gameengine/Expressions/Expression.h
index 5f5db505331..d1b7eda43f0 100644
--- a/source/gameengine/Expressions/Expression.h
+++ b/source/gameengine/Expressions/Expression.h
@@ -146,5 +146,4 @@ protected:
 #endif
 };
 
-#endif // !defined __EXPRESSION_H__
-
+#endif  /* __EXPRESSION_H__ */
diff --git a/source/gameengine/Expressions/FloatValue.h b/source/gameengine/Expressions/FloatValue.h
index 59311e5d373..bc6a2d052d4 100644
--- a/source/gameengine/Expressions/FloatValue.h
+++ b/source/gameengine/Expressions/FloatValue.h
@@ -54,5 +54,4 @@ protected:
 #endif
 };
 
-#endif // !defined __FLOATVALUE_H__
-
+#endif  /* __FLOATVALUE_H__ */
diff --git a/source/gameengine/Expressions/IdentifierExpr.h b/source/gameengine/Expressions/IdentifierExpr.h
index 58e75c4b02e..26eb3691378 100644
--- a/source/gameengine/Expressions/IdentifierExpr.h
+++ b/source/gameengine/Expressions/IdentifierExpr.h
@@ -56,5 +56,4 @@ public:
 #endif
 };
 
-#endif //__IDENTIFIEREXPR_H__
-
+#endif  /* __IDENTIFIEREXPR_H__ */
diff --git a/source/gameengine/Expressions/IfExpr.h b/source/gameengine/Expressions/IfExpr.h
index f8ed81168d0..80e35471d82 100644
--- a/source/gameengine/Expressions/IfExpr.h
+++ b/source/gameengine/Expressions/IfExpr.h
@@ -16,12 +16,8 @@
  *  \ingroup expressions
  */
 
-#if !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_)
-#define AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_
-
-#if defined(_MSC_VER) && _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
+#ifndef __IFEXPR_H__
+#define __IFEXPR_H__
 
 #include "Expression.h"
 
@@ -55,5 +51,4 @@ public:
 #endif
 };
 
-#endif // !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_)
-
+#endif  /* __IFEXPR_H__ */
diff --git a/source/gameengine/Expressions/IntValue.h b/source/gameengine/Expressions/IntValue.h
index e728467cc4e..8411b09693c 100644
--- a/source/gameengine/Expressions/IntValue.h
+++ b/source/gameengine/Expressions/IntValue.h
@@ -69,5 +69,4 @@ private:
 #endif
 };
 
-#endif // !defined __INTVALUE_H__
-
+#endif  /* __INTVALUE_H__ */
diff --git a/source/gameengine/Expressions/KX_HashedPtr.h b/source/gameengine/Expressions/KX_HashedPtr.h
index 866689ed203..d822af38c44 100644
--- a/source/gameengine/Expressions/KX_HashedPtr.h
+++ b/source/gameengine/Expressions/KX_HashedPtr.h
@@ -58,5 +58,4 @@ public:
 #endif
 };
 
-#endif //__KX_HASHEDPTR_H__
-
+#endif  /* __KX_HASHEDPTR_H__ */
diff --git a/source/gameengine/Expressions/KX_Python.h b/source/gameengine/Expressions/KX_Python.h
index 4a7ce4d3fb7..62dd9a13dd4 100644
--- a/source/gameengine/Expressions/KX_Python.h
+++ b/source/gameengine/Expressions/KX_Python.h
@@ -79,5 +79,4 @@
 #undef toupper
 #endif
 
-#endif // __KX_PYTHON_H__
-
+#endif  /* __KX_PYTHON_H__ */
diff --git a/source/gameengine/Expressions/ListValue.h b/source/gameengine/Expressions/ListValue.h
index 20005088310..5240c54ae4e 100644
--- a/source/gameengine/Expressions/ListValue.h
+++ b/source/gameengine/Expressions/ListValue.h
@@ -87,5 +87,5 @@ private:
 	bool	m_bReleaseContents;
 };
 
-#endif // !defined __LISTVALUE_H__
+#endif  /* __LISTVALUE_H__ */
 
diff --git a/source/gameengine/Expressions/Operator1Expr.h b/source/gameengine/Expressions/Operator1Expr.h
index 13a1b16500a..3dd76f773f2 100644
--- a/source/gameengine/Expressions/Operator1Expr.h
+++ b/source/gameengine/Expressions/Operator1Expr.h
@@ -16,8 +16,8 @@
  *  \ingroup expressions
  */
 
-#if !defined(AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_)
-#define AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_
+#ifndef __OPERATOR1EXPR_H__
+#define __OPERATOR1EXPR_H__
 
 #include "Expression.h"
 
@@ -56,5 +56,4 @@ private:
 #endif
 };
 
-#endif // !defined(AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_)
-
+#endif  /* __OPERATOR1EXPR_H__ */
diff --git a/source/gameengine/Expressions/Operator2Expr.h b/source/gameengine/Expressions/Operator2Expr.h
index 23272930131..8c30b7cd634 100644
--- a/source/gameengine/Expressions/Operator2Expr.h
+++ b/source/gameengine/Expressions/Operator2Expr.h
@@ -62,5 +62,5 @@ private:
 #endif
 };
 
-#endif // !defined __OPERATOR2EXPR_H__
+#endif  /* __OPERATOR2EXPR_H__ */
 
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index 005bf2f6cb2..83b7c8c8771 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -548,7 +548,7 @@ public: \
 #define Py_HeaderPtr \
 public: \
 
-#endif // WITH_CXX_GUARDEDALLOC
+#endif  /* WITH_CXX_GUARDEDALLOC */
 
 #endif
 
@@ -633,4 +633,4 @@ public:
 PyObject *PyUnicode_From_STR_String(const STR_String& str);
 #endif
 
-#endif //  __PYOBJECTPLUS_H__
+#endif  /* __PYOBJECTPLUS_H__ */
diff --git a/source/gameengine/Expressions/StringValue.h b/source/gameengine/Expressions/StringValue.h
index bc102c6e203..22d433455ec 100644
--- a/source/gameengine/Expressions/StringValue.h
+++ b/source/gameengine/Expressions/StringValue.h
@@ -45,7 +45,7 @@ public:
 	virtual PyObject*	ConvertValueToPython() {
 		return PyUnicode_From_STR_String(m_strString);
 	}
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 private:
 	// data member
@@ -57,5 +57,4 @@ private:
 #endif
 };
 
-#endif
-
+#endif  /* __STRINGVALUE_H__ */
diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h
index e0c4daeccd0..92b5e20543c 100644
--- a/source/gameengine/Expressions/Value.h
+++ b/source/gameengine/Expressions/Value.h
@@ -16,13 +16,13 @@
  *  \ingroup expressions
  */
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786)
-#endif //WIN32
-
 #ifndef __VALUE_H__
 #define __VALUE_H__
 
+#if defined(WIN32) && !defined(FREE_WINDOWS)
+#pragma warning (disable:4786)
+#endif  /* WIN32 */
+
 #include <map>		// array functionality for the propertylist
 #include "STR_String.h"	// STR_String class
 
@@ -53,14 +53,6 @@ using namespace std;
 #define	assertd(exp)			((void)NULL)
 #endif
 
-
-#ifndef USE_PRAGMA_ONCE
-#ifdef WIN32
-	#pragma once
-
-#endif //WIN32
-#endif
-
 enum VALUE_OPERATOR {
 	
 	VALUE_MOD_OPERATOR,			// %
@@ -233,7 +225,7 @@ public:
 	static PyObject *pyattr_get_name(void * self, const KX_PYATTRIBUTE_DEF * attrdef);
 	
 	virtual PyObject *ConvertKeysToPython( void );
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 	
 	
@@ -439,5 +431,4 @@ protected:
 #endif
 };
 
-#endif // !defined _VALUEBASECLASS_H
-
+#endif  /* __VALUE_H__ */
diff --git a/source/gameengine/Expressions/VectorValue.h b/source/gameengine/Expressions/VectorValue.h
index b7afa61d4dd..9b9f9612810 100644
--- a/source/gameengine/Expressions/VectorValue.h
+++ b/source/gameengine/Expressions/VectorValue.h
@@ -90,5 +90,4 @@ protected:
 #endif
 };
 
-#endif // !defined __VECTORVALUE_H__
-
+#endif  /* __VECTORVALUE_H__ */
diff --git a/source/gameengine/Expressions/VoidValue.h b/source/gameengine/Expressions/VoidValue.h
index a1a82f8aa65..e97278b3142 100644
--- a/source/gameengine/Expressions/VoidValue.h
+++ b/source/gameengine/Expressions/VoidValue.h
@@ -78,4 +78,3 @@ public:
 };
 
 #endif  /* __VOIDVALUE_H__ */
-
diff --git a/source/gameengine/GameLogic/SCA_ANDController.h b/source/gameengine/GameLogic/SCA_ANDController.h
index ccc3f9be3af..ff152d6d2fb 100644
--- a/source/gameengine/GameLogic/SCA_ANDController.h
+++ b/source/gameengine/GameLogic/SCA_ANDController.h
@@ -48,5 +48,4 @@ public:
 	virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__SCA_ANDCONTROLLER_H__
-
+#endif  /* __SCA_ANDCONTROLLER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_ActuatorEventManager.h b/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
index dee9ea4e8ba..997be1145db 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
+++ b/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
@@ -53,5 +53,4 @@ public:
 #endif
 };
 
-#endif //__SCA_ACTUATOREVENTMANAGER_H__
-
+#endif  /* __SCA_ACTUATOREVENTMANAGER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.h b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
index 894dc2162cf..6005bd3ac6c 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorSensor.h
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
@@ -64,7 +64,7 @@ public:
 
 	static int CheckActuator(void *self, const PyAttributeDef*);
 	
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 };
 
-#endif
+#endif  /* __SCA_ACTUATORSENSOR_H__ */
diff --git a/source/gameengine/GameLogic/SCA_AlwaysEventManager.h b/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
index cf4063fba1f..47293c75726 100644
--- a/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
+++ b/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
@@ -47,5 +47,4 @@ public:
 #endif
 };
 
-#endif //__SCA_ALWAYSEVENTMANAGER_H__
-
+#endif  /* __SCA_ALWAYSEVENTMANAGER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_AlwaysSensor.h b/source/gameengine/GameLogic/SCA_AlwaysSensor.h
index d0963fd0ea1..e0ab4279b1c 100644
--- a/source/gameengine/GameLogic/SCA_AlwaysSensor.h
+++ b/source/gameengine/GameLogic/SCA_AlwaysSensor.h
@@ -50,5 +50,4 @@ public:
 	virtual void Init();
 };
 
-#endif //__SCA_ALWAYSSENSOR_H__
-
+#endif  /* __SCA_ALWAYSSENSOR_H__ */
diff --git a/source/gameengine/GameLogic/SCA_BasicEventManager.h b/source/gameengine/GameLogic/SCA_BasicEventManager.h
index 24206e46a61..a015233454b 100644
--- a/source/gameengine/GameLogic/SCA_BasicEventManager.h
+++ b/source/gameengine/GameLogic/SCA_BasicEventManager.h
@@ -54,5 +54,4 @@ public:
 #endif
 };
 
-#endif //__SCA_BASICEVENTMANAGER_H__
-
+#endif  /* __SCA_BASICEVENTMANAGER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.h b/source/gameengine/GameLogic/SCA_DelaySensor.h
index 2c408921f27..b516cd8360e 100644
--- a/source/gameengine/GameLogic/SCA_DelaySensor.h
+++ b/source/gameengine/GameLogic/SCA_DelaySensor.h
@@ -65,5 +65,4 @@ public:
 
 };
 
-#endif //__KX_ALWAYSSENSOR
-
+#endif  /* __SCA_DELAYSENSOR_H__ */
diff --git a/source/gameengine/GameLogic/SCA_ExpressionController.h b/source/gameengine/GameLogic/SCA_ExpressionController.h
index 06edc83ab96..c16944ccde1 100644
--- a/source/gameengine/GameLogic/SCA_ExpressionController.h
+++ b/source/gameengine/GameLogic/SCA_ExpressionController.h
@@ -63,5 +63,4 @@ public:
 #endif
 };
 
-#endif //__SCA_EXPRESSIONCONTROLLER_H__
-
+#endif  /* __SCA_EXPRESSIONCONTROLLER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_IActuator.h b/source/gameengine/GameLogic/SCA_IActuator.h
index 801483bb882..090df1e75e2 100644
--- a/source/gameengine/GameLogic/SCA_IActuator.h
+++ b/source/gameengine/GameLogic/SCA_IActuator.h
@@ -164,5 +164,4 @@ public:
 #endif
 };
 
-#endif //__SCA_IACTUATOR_H__
-
+#endif  /* __SCA_IACTUATOR_H__ */
diff --git a/source/gameengine/GameLogic/SCA_IController.h b/source/gameengine/GameLogic/SCA_IController.h
index 656c4299dff..1bc6b60bf1e 100644
--- a/source/gameengine/GameLogic/SCA_IController.h
+++ b/source/gameengine/GameLogic/SCA_IController.h
@@ -106,8 +106,7 @@ public:
 	static PyObject*	pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject*	pyattr_get_sensors(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject*	pyattr_get_actuators(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 };
 
-#endif
-
+#endif  /* __SCA_ICONTROLLER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h
index 66a1209751d..bc4d22eaaaf 100644
--- a/source/gameengine/GameLogic/SCA_IInputDevice.h
+++ b/source/gameengine/GameLogic/SCA_IInputDevice.h
@@ -320,5 +320,5 @@ public:
 #endif
 };
 
-#endif	//__SCA_IINPUTDEVICE_H__
+#endif	 /* __SCA_IINPUTDEVICE_H__ */
 
diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.h b/source/gameengine/GameLogic/SCA_ILogicBrick.h
index c5fa9399ab7..dc0aa4ce331 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.h
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.h
@@ -159,9 +159,8 @@ protected:
 	/** Convert a a c++ value to KX_TRUE, KX_FALSE in Python. */
 	PyObject *BoolToPyArg(bool);
 	
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 };
 
-#endif
-
+#endif  /* __SCA_ILOGICBRICK_H__ */
diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h
index a850d23babf..0189af00322 100644
--- a/source/gameengine/GameLogic/SCA_IObject.h
+++ b/source/gameengine/GameLogic/SCA_IObject.h
@@ -225,5 +225,4 @@ 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 a399e313082..997266976ad 100644
--- a/source/gameengine/GameLogic/SCA_IScene.h
+++ b/source/gameengine/GameLogic/SCA_IScene.h
@@ -78,5 +78,4 @@ public:
 #endif
 };
 
-#endif //__SCA_ISCENE_H__
-
+#endif  /* __SCA_ISCENE_H__ */
diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h
index 3bb29f3f0a2..091aa675741 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.h
+++ b/source/gameengine/GameLogic/SCA_ISensor.h
@@ -212,8 +212,7 @@ public:
 		KX_SENSOR_JUST_DEACTIVATED
 	
 	};
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 };
 
-#endif //__SCA_ISENSOR_H__
-
+#endif  /* __SCA_ISENSOR_H__ */
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h
index 5dc35faf244..6c6dc019a5e 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.h
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h
@@ -30,11 +30,11 @@
  */
 
 
-#ifndef __JOYSENSOR_H_
-#define __JOYSENSOR_H
+#ifndef __JOYSENSOR_H__
+#define __JOYSENSOR_H__
 
 #include "SCA_ISensor.h"
-#include "./Joystick/SCA_JoystickDefines.h"
+#include "Joystick/SCA_JoystickDefines.h"
 
 class SCA_JoystickSensor :public SCA_ISensor
 {
@@ -161,8 +161,8 @@ public:
 		return 0;
 	}
 	
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 };
 
-#endif
+#endif  /* __JOYSENSOR_H__ */
diff --git a/source/gameengine/GameLogic/SCA_KeyboardManager.h b/source/gameengine/GameLogic/SCA_KeyboardManager.h
index fd3c0706fa7..cd1cbf4adee 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardManager.h
+++ b/source/gameengine/GameLogic/SCA_KeyboardManager.h
@@ -63,5 +63,4 @@ public:
 #endif
 };
 
-#endif //__SCA_KEYBOARDMANAGER_H__
-
+#endif  /* __SCA_KEYBOARDMANAGER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
index caa141e48f2..c6610d0284e 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
@@ -138,7 +138,4 @@ bool IsPrintable(int keyIndex);
 bool IsDelete(int keyIndex);
 
 
-#endif //__SCA_KEYBOARDSENSOR_H__
-
-
-
+#endif  /* __SCA_KEYBOARDSENSOR_H__ */
diff --git a/source/gameengine/GameLogic/SCA_LogicManager.h b/source/gameengine/GameLogic/SCA_LogicManager.h
index 817f3a1c22a..f3d02cccf26 100644
--- a/source/gameengine/GameLogic/SCA_LogicManager.h
+++ b/source/gameengine/GameLogic/SCA_LogicManager.h
@@ -151,5 +151,4 @@ public:
 #endif
 };
 
-#endif //__SCA_LOGICMANAGER_H__
-
+#endif  /* __SCA_LOGICMANAGER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_MouseManager.h b/source/gameengine/GameLogic/SCA_MouseManager.h
index 02c28807566..a57e52070a7 100644
--- a/source/gameengine/GameLogic/SCA_MouseManager.h
+++ b/source/gameengine/GameLogic/SCA_MouseManager.h
@@ -72,5 +72,4 @@ public:
 #endif
 };
 
-#endif //__SCA_MOUSEMANAGER_H__
-
+#endif  /* __SCA_MOUSEMANAGER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h
index d4eff371d4a..8d05a548681 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.h
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.h
@@ -117,5 +117,4 @@ class SCA_MouseSensor : public SCA_ISensor
 #endif
 };
 
-#endif //__SCA_MOUSESENSOR_H__
-
+#endif  /* __SCA_MOUSESENSOR_H__ */
diff --git a/source/gameengine/GameLogic/SCA_NANDController.h b/source/gameengine/GameLogic/SCA_NANDController.h
index 040df7f0ade..a3f02908dd2 100644
--- a/source/gameengine/GameLogic/SCA_NANDController.h
+++ b/source/gameengine/GameLogic/SCA_NANDController.h
@@ -49,5 +49,4 @@ public:
 	/* --------------------------------------------------------------------- */
 };
 
-#endif //__SCA_NANDCONTROLLER_H__
-
+#endif  /* __SCA_NANDCONTROLLER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_NORController.h b/source/gameengine/GameLogic/SCA_NORController.h
index 1630f8055ec..ec8159de8d1 100644
--- a/source/gameengine/GameLogic/SCA_NORController.h
+++ b/source/gameengine/GameLogic/SCA_NORController.h
@@ -45,5 +45,4 @@ public:
 	virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__SCA_NORCONTROLLER_H__
-
+#endif  /* __SCA_NORCONTROLLER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_ORController.h b/source/gameengine/GameLogic/SCA_ORController.h
index 9a4e4c7398d..9499c893c72 100644
--- a/source/gameengine/GameLogic/SCA_ORController.h
+++ b/source/gameengine/GameLogic/SCA_ORController.h
@@ -46,5 +46,4 @@ public:
 	virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__SCA_ORCONTROLLER_H__
-
+#endif  /* __SCA_ORCONTROLLER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.h b/source/gameengine/GameLogic/SCA_PropertyActuator.h
index e465098131e..83a6d05df1b 100644
--- a/source/gameengine/GameLogic/SCA_PropertyActuator.h
+++ b/source/gameengine/GameLogic/SCA_PropertyActuator.h
@@ -86,5 +86,4 @@ public:
 	
 };
 
-#endif //__KX_PROPERTYACTUATOR_DOC
-
+#endif  /* __KX_PROPERTYACTUATOR_DOC */
diff --git a/source/gameengine/GameLogic/SCA_PropertyEventManager.h b/source/gameengine/GameLogic/SCA_PropertyEventManager.h
index 7a4ec750484..554fe686df2 100644
--- a/source/gameengine/GameLogic/SCA_PropertyEventManager.h
+++ b/source/gameengine/GameLogic/SCA_PropertyEventManager.h
@@ -52,5 +52,4 @@ public:
 #endif
 };
 
-#endif //__SCA_PROPERTYEVENTMANAGER_H__
-
+#endif  /* __SCA_PROPERTYEVENTMANAGER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_PythonController.h b/source/gameengine/GameLogic/SCA_PythonController.h
index 8a72ce6bad9..f1f10d22711 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.h
+++ b/source/gameengine/GameLogic/SCA_PythonController.h
@@ -115,5 +115,4 @@ class SCA_PythonController : public SCA_IController
 #endif
 };
 
-#endif //__SCA_PYTHONCONTROLLER_H__
-
+#endif  /* __SCA_PYTHONCONTROLLER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_PythonKeyboard.h b/source/gameengine/GameLogic/SCA_PythonKeyboard.h
index aab49bcb83b..53068f38e6a 100644
--- a/source/gameengine/GameLogic/SCA_PythonKeyboard.h
+++ b/source/gameengine/GameLogic/SCA_PythonKeyboard.h
@@ -47,5 +47,4 @@ public:
 #endif
 };
 
-#endif //__SCA_PYTHONKEYBOARD_H__
-
+#endif  /* __SCA_PYTHONKEYBOARD_H__ */
diff --git a/source/gameengine/GameLogic/SCA_PythonMouse.h b/source/gameengine/GameLogic/SCA_PythonMouse.h
index f770a54d6e6..bc6e65f07a8 100644
--- a/source/gameengine/GameLogic/SCA_PythonMouse.h
+++ b/source/gameengine/GameLogic/SCA_PythonMouse.h
@@ -56,5 +56,4 @@ public:
 #endif
 };
 
-#endif //__SCA_PYTHONMOUSE_H__
-
+#endif  /* __SCA_PYTHONMOUSE_H__ */
diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.h b/source/gameengine/GameLogic/SCA_RandomActuator.h
index f61de24c0cc..32b29fc4f43 100644
--- a/source/gameengine/GameLogic/SCA_RandomActuator.h
+++ b/source/gameengine/GameLogic/SCA_RandomActuator.h
@@ -112,7 +112,7 @@ class SCA_RandomActuator : public SCA_IActuator
 	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatNormal);
 	KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatNegativeExponential);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 }; /* end of class KX_EditObjectActuator : public SCA_PropertyActuator */
 
diff --git a/source/gameengine/GameLogic/SCA_RandomEventManager.h b/source/gameengine/GameLogic/SCA_RandomEventManager.h
index b46899b1355..2d83c5fcdca 100644
--- a/source/gameengine/GameLogic/SCA_RandomEventManager.h
+++ b/source/gameengine/GameLogic/SCA_RandomEventManager.h
@@ -51,5 +51,4 @@ public:
 #endif
 };
 
-#endif //__SCA_RANDOMEVENTMANAGER_H__
-
+#endif  /* __SCA_RANDOMEVENTMANAGER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.h b/source/gameengine/GameLogic/SCA_RandomSensor.h
index 008445ef878..628562b77e6 100644
--- a/source/gameengine/GameLogic/SCA_RandomSensor.h
+++ b/source/gameengine/GameLogic/SCA_RandomSensor.h
@@ -68,5 +68,4 @@ public:
 #endif
 };
 
-#endif //__SCA_RANDOMSENSOR_H__
-
+#endif  /* __SCA_RANDOMSENSOR_H__ */
diff --git a/source/gameengine/GameLogic/SCA_TimeEventManager.h b/source/gameengine/GameLogic/SCA_TimeEventManager.h
index 092cf016370..4c929dca23c 100644
--- a/source/gameengine/GameLogic/SCA_TimeEventManager.h
+++ b/source/gameengine/GameLogic/SCA_TimeEventManager.h
@@ -59,5 +59,4 @@ public:
 #endif
 };
 
-#endif //__SCA_TIMEEVENTMANAGER_H__
-
+#endif  /* __SCA_TIMEEVENTMANAGER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_XNORController.h b/source/gameengine/GameLogic/SCA_XNORController.h
index 5ef4dc67cf2..c257b71273e 100644
--- a/source/gameengine/GameLogic/SCA_XNORController.h
+++ b/source/gameengine/GameLogic/SCA_XNORController.h
@@ -50,5 +50,4 @@ public:
 
 };
 
-#endif //__SCA_XNORCONTROLLER_H__
-
+#endif  /* __SCA_XNORCONTROLLER_H__ */
diff --git a/source/gameengine/GameLogic/SCA_XORController.h b/source/gameengine/GameLogic/SCA_XORController.h
index 56cd2440863..c64a3380ede 100644
--- a/source/gameengine/GameLogic/SCA_XORController.h
+++ b/source/gameengine/GameLogic/SCA_XORController.h
@@ -45,5 +45,4 @@ public:
 	virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__SCA_XORCONTROLLER_H__
-
+#endif  /* __SCA_XORCONTROLLER_H__ */
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h
index 2a597c4c43d..a995dcfaa86 100644
--- a/source/gameengine/GamePlayer/common/GPC_Canvas.h
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h
@@ -38,7 +38,7 @@
 #ifdef WIN32
 	#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
 	#include <windows.h>
-#endif // WIN32
+#endif  /* WIN32 */
 
 #include "GL/glew.h"
 
@@ -273,5 +273,4 @@ 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 60f0d2af199..6247bd630bb 100644
--- a/source/gameengine/GamePlayer/common/GPC_Engine.h
+++ b/source/gameengine/GamePlayer/common/GPC_Engine.h
@@ -121,5 +121,4 @@ 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 63e051dd1d4..afe7f921a61 100644
--- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
+++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
@@ -34,7 +34,7 @@
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
-#endif // WIN32
+#endif  /* WIN32 */
 
 #include "SCA_IInputDevice.h"
 
@@ -87,5 +87,4 @@ public:
 	virtual void HookEscape();
 };
 
-#endif  // _GPC_KEYBOARDDEVICE_H
-
+#endif  /* __GPC_KEYBOARDDEVICE_H__ */
diff --git a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
index 2db1b1ec34c..7699a9e3eae 100644
--- a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
+++ b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
@@ -34,7 +34,7 @@
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
-#endif // WIN32
+#endif  /* WIN32 */
 
 #include "SCA_IInputDevice.h"
 
@@ -102,5 +102,4 @@ protected:
 	virtual bool ConvertEvent(KX_EnumInputs kxevent, int eventval);
 };
 
-#endif  // __GPC_MOUSEDEVICE_H__
-
+#endif  /* __GPC_MOUSEDEVICE_H__ */
diff --git a/source/gameengine/GamePlayer/common/GPC_RawImage.h b/source/gameengine/GamePlayer/common/GPC_RawImage.h
index 4d3f45597f8..afff59484b9 100644
--- a/source/gameengine/GamePlayer/common/GPC_RawImage.h
+++ b/source/gameengine/GamePlayer/common/GPC_RawImage.h
@@ -117,5 +117,4 @@ protected:
 	int m_height;
 };
 
-#endif // __GPC_RAWIMAGE_H__
-
+#endif  /* __GPC_RAWIMAGE_H__ */
diff --git a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
index 6f15276ab83..d5c1b210454 100644
--- a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
+++ b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
@@ -34,5 +34,4 @@
 
 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 ade00020353..bb5c5e220a3 100644
--- a/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
+++ b/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
@@ -38,5 +38,4 @@ 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 166a931beab..1030c09548a 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
@@ -36,7 +36,7 @@
 // don't show stl-warnings
 #pragma warning (disable:4786)
 #include <windows.h>
-#endif // WIN32
+#endif  /* WIN32 */
 
 #include "RAS_IRenderTools.h"
 
@@ -106,7 +106,4 @@ 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 03bb7743637..4169064179e 100644
--- a/source/gameengine/GamePlayer/common/GPC_System.h
+++ b/source/gameengine/GamePlayer/common/GPC_System.h
@@ -59,5 +59,4 @@ 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 d931f605a64..f2d7ec267f3 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
@@ -34,7 +34,7 @@
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
-#endif // WIN32
+#endif  /* WIN32 */
 
 #include "GPC_Canvas.h"
 
@@ -66,5 +66,4 @@ 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 8d72a621b6a..4c6b8205a42 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
@@ -35,7 +35,7 @@
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
-#endif // WIN32
+#endif  /* WIN32 */
 
 #include "GHOST_Types.h"
 #include "GPC_KeyboardDevice.h"
@@ -53,5 +53,4 @@ 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 796ad0c2b8c..d68fc812dd3 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_System.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_System.h
@@ -35,7 +35,7 @@
 
 #ifdef WIN32
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
-#endif // WIN32
+#endif  /* WIN32 */
 
 #include "GPC_System.h"
 
@@ -51,5 +51,4 @@ 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 ab2adf7fe34..370bbf51d72 100644
--- a/source/gameengine/Ketsji/BL_Action.h
+++ b/source/gameengine/Ketsji/BL_Action.h
@@ -136,5 +136,4 @@ public:
 #endif
 };
 
-#endif //BL_ACTION
-
+#endif  /* BL_ACTION */
diff --git a/source/gameengine/Ketsji/BL_ActionManager.h b/source/gameengine/Ketsji/BL_ActionManager.h
index dbdaa6652ad..600e7b6621e 100644
--- a/source/gameengine/Ketsji/BL_ActionManager.h
+++ b/source/gameengine/Ketsji/BL_ActionManager.h
@@ -98,5 +98,4 @@ public:
 #endif
 };
 
-#endif //BL_ACTIONMANAGER
-
+#endif  /* BL_ACTIONMANAGER */
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h
index f23dbfdf3a5..626c65baadd 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.h
+++ b/source/gameengine/Ketsji/BL_BlenderShader.h
@@ -101,4 +101,4 @@ public:
 #endif
 };
 
-#endif//__BL_BLENDERSHADER_H__
+#endif /* __BL_BLENDERSHADER_H__ */
diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h
index b577a1849a0..82476873b85 100644
--- a/source/gameengine/Ketsji/BL_Shader.h
+++ b/source/gameengine/Ketsji/BL_Shader.h
@@ -252,4 +252,4 @@ public:
 #endif
 };
 
-#endif//__BL_SHADER_H__
+#endif /* __BL_SHADER_H__ */
diff --git a/source/gameengine/Ketsji/BL_Texture.h b/source/gameengine/Ketsji/BL_Texture.h
index a6bd354d260..cd18ef93822 100644
--- a/source/gameengine/Ketsji/BL_Texture.h
+++ b/source/gameengine/Ketsji/BL_Texture.h
@@ -79,4 +79,4 @@ public:
 #endif
 };
 
-#endif//__BL_TEXTURE_H__
+#endif /* __BL_TEXTURE_H__ */
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
index 3202785ee81..9a13b6d53e2 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
@@ -52,5 +52,4 @@ public:
 		return m_ndi; }
 };
 
-#endif //__KX_NETWORKEVENTMANAGER_H__
-
+#endif  /* __KX_NETWORKEVENTMANAGER_H__ */
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
index 980e1cda6dc..325a7be9bd7 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
@@ -69,5 +69,4 @@ 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 6b9779de6e3..a1f0692b7b3 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
@@ -83,9 +83,8 @@ public:
 	static PyObject*	pyattr_get_bodies(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject*	pyattr_get_subjects(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 };
 
-#endif //__KX_NETWORKMESSAGESENSOR_H__
-
+#endif  /* __KX_NETWORKMESSAGESENSOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_ArmatureSensor.h b/source/gameengine/Ketsji/KX_ArmatureSensor.h
index 74603b3ff01..b3ea905d198 100644
--- a/source/gameengine/Ketsji/KX_ArmatureSensor.h
+++ b/source/gameengine/Ketsji/KX_ArmatureSensor.h
@@ -74,7 +74,7 @@ public:
 	/* --------------------------------------------------------------------- */
 	static PyObject *pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 private:
 	struct bConstraint*	m_constraint;
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h
index a69f5c92d19..1653669ebcc 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -119,7 +119,7 @@ public:
 	KX_PYMETHOD_DOC(KX_BlenderMaterial, setTexture);
 
 	KX_PYMETHOD_DOC(KX_BlenderMaterial, setBlending);
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 	// --------------------------------
 	// pre calculate to avoid pops/lag at startup
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.h b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
index 71e806686ca..4813b39a34e 100644
--- a/source/gameengine/Ketsji/KX_BulletPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
@@ -96,5 +96,4 @@ public:
 #endif
 };
 
-#endif //__KX_BULLETPHYSICSCONTROLLER_H__
-
+#endif  /* __KX_BULLETPHYSICSCONTROLLER_H__ */
diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h
index d95d10e8384..6c1dc1edb51 100644
--- a/source/gameengine/Ketsji/KX_Camera.h
+++ b/source/gameengine/Ketsji/KX_Camera.h
@@ -321,5 +321,4 @@ public:
 #endif
 };
 
-#endif //__KX_CAMERA_H__
-
+#endif  /* __KX_CAMERA_H__ */
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.h b/source/gameengine/Ketsji/KX_CameraActuator.h
index c67174d2830..fb0a7d88dd9 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.h
+++ b/source/gameengine/Ketsji/KX_CameraActuator.h
@@ -131,9 +131,8 @@ private :
 	static PyObject*	pyattr_get_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static int			pyattr_set_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 };
 
-#endif //__KX_CAMERAACTUATOR_H__
-
+#endif  /* __KX_CAMERAACTUATOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_CameraIpoSGController.h b/source/gameengine/Ketsji/KX_CameraIpoSGController.h
index 9b7c1eddf00..1f6f211622c 100644
--- a/source/gameengine/Ketsji/KX_CameraIpoSGController.h
+++ b/source/gameengine/Ketsji/KX_CameraIpoSGController.h
@@ -94,5 +94,4 @@ 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 6fd1271160a..e947eb4be6d 100644
--- a/source/gameengine/Ketsji/KX_ClientObjectInfo.h
+++ b/source/gameengine/Ketsji/KX_ClientObjectInfo.h
@@ -84,5 +84,4 @@ public:
 #endif
 };
 
-#endif //__KX_CLIENTOBJECTINFO_H__
-
+#endif  /* __KX_CLIENTOBJECTINFO_H__ */
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.h b/source/gameengine/Ketsji/KX_ConstraintActuator.h
index 786e4ff53d2..edb2e5e0180 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.h
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.h
@@ -145,5 +145,4 @@ protected:
 
 };
 
-#endif //__KX_CONSTRAINTACTUATOR_H__
-
+#endif  /* __KX_CONSTRAINTACTUATOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.h b/source/gameengine/Ketsji/KX_ConstraintWrapper.h
index dbc3571cad6..eafc45b5a70 100644
--- a/source/gameengine/Ketsji/KX_ConstraintWrapper.h
+++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.h
@@ -57,5 +57,4 @@ private:
 	PHY_IPhysicsEnvironment* m_physenv;
 };
 
-#endif //__KX_CONSTRAINTWRAPPER_H__
-
+#endif  /* __KX_CONSTRAINTWRAPPER_H__ */
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
index 0f1ce403881..e71037d08a0 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
@@ -159,4 +159,4 @@ void	KX_ClearBulletSharedShapes();
 bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *from_gameobj, RAS_MeshObject* from_meshobj);
 
 #endif
-#endif //__KX_CONVERTPHYSICSOBJECT_H__
+#endif  /* __KX_CONVERTPHYSICSOBJECT_H__ */
diff --git a/source/gameengine/Ketsji/KX_EmptyObject.h b/source/gameengine/Ketsji/KX_EmptyObject.h
index b99f44c38c5..63a0782a544 100644
--- a/source/gameengine/Ketsji/KX_EmptyObject.h
+++ b/source/gameengine/Ketsji/KX_EmptyObject.h
@@ -47,5 +47,4 @@ public:
 #endif
 };
 
-#endif //__KX_EMPTYOBJECT_H__
-
+#endif  /* __KX_EMPTYOBJECT_H__ */
diff --git a/source/gameengine/Ketsji/KX_FontObject.h b/source/gameengine/Ketsji/KX_FontObject.h
index ae8b4166238..ac22de6fb6f 100644
--- a/source/gameengine/Ketsji/KX_FontObject.h
+++ b/source/gameengine/Ketsji/KX_FontObject.h
@@ -76,4 +76,4 @@ protected:
 
 };
 
-#endif //__KX_FONTOBJECT_H__
+#endif  /* __KX_FONTOBJECT_H__ */
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 621dd988e00..52fc3da5465 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -1041,5 +1041,4 @@ public:
 
 
 
-#endif //__KX_GAMEOBJECT_H__
-
+#endif  /* __KX_GAMEOBJECT_H__ */
diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.h b/source/gameengine/Ketsji/KX_IPO_SGController.h
index 266b89ff969..cecfa9804db 100644
--- a/source/gameengine/Ketsji/KX_IPO_SGController.h
+++ b/source/gameengine/Ketsji/KX_IPO_SGController.h
@@ -126,6 +126,4 @@ public:
 #endif
 };
 
-#endif //__KX_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 dd34549c1fb..280b1816a1e 100644
--- a/source/gameengine/Ketsji/KX_IPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_IPhysicsController.h
@@ -145,5 +145,4 @@ public:
 #endif
 };
 
-#endif //__KX_IPHYSICSCONTROLLER_H__
-
+#endif  /* __KX_IPHYSICSCONTROLLER_H__ */
diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h
index 919ae1d6de5..18fb336dbe0 100644
--- a/source/gameengine/Ketsji/KX_ISceneConverter.h
+++ b/source/gameengine/Ketsji/KX_ISceneConverter.h
@@ -93,5 +93,4 @@ public:
 #endif
 };
 
-#endif //__KX_ISCENECONVERTER_H__
-
+#endif  /* __KX_ISCENECONVERTER_H__ */
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h
index 58cdfc28742..1c2f4e49b72 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.h
+++ b/source/gameengine/Ketsji/KX_IpoActuator.h
@@ -150,5 +150,4 @@ public:
 	
 };
 
-#endif //__KX_IPOACTUATOR_H__
-
+#endif  /* __KX_IPOACTUATOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index e05ba652bbe..972594bd90f 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -447,6 +447,4 @@ protected:
 #endif
 };
 
-#endif //__KX_KETSJIENGINE_H__
-
-
+#endif  /* __KX_KETSJIENGINE_H__ */
diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h
index 7426896a92a..52f076c772a 100644
--- a/source/gameengine/Ketsji/KX_Light.h
+++ b/source/gameengine/Ketsji/KX_Light.h
@@ -83,5 +83,4 @@ public:
 #endif
 };
 
-#endif //__KX_LIGHT_H__
-
+#endif  /* __KX_LIGHT_H__ */
diff --git a/source/gameengine/Ketsji/KX_LightIpoSGController.h b/source/gameengine/Ketsji/KX_LightIpoSGController.h
index 4a1ceba0963..c82fe7bcad5 100644
--- a/source/gameengine/Ketsji/KX_LightIpoSGController.h
+++ b/source/gameengine/Ketsji/KX_LightIpoSGController.h
@@ -102,5 +102,4 @@ public:
 #endif
 };
 
-#endif // __KX_LIGHTIPOSGCONTROLLER_H__
-
+#endif  /* __KX_LIGHTIPOSGCONTROLLER_H__ */
diff --git a/source/gameengine/Ketsji/KX_MaterialIpoController.h b/source/gameengine/Ketsji/KX_MaterialIpoController.h
index ee5546641c2..a7e9c2cc1c5 100644
--- a/source/gameengine/Ketsji/KX_MaterialIpoController.h
+++ b/source/gameengine/Ketsji/KX_MaterialIpoController.h
@@ -62,7 +62,4 @@ public:
 #endif
 };
 
-
-
-
-#endif//__KX_MATERIALIPOCONTROLLER_H__
+#endif /* __KX_MATERIALIPOCONTROLLER_H__ */
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.h b/source/gameengine/Ketsji/KX_MeshProxy.h
index a05ef6ab2e7..98e73aa626f 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.h
+++ b/source/gameengine/Ketsji/KX_MeshProxy.h
@@ -77,7 +77,6 @@ public:
 	static PyObject *pyattr_get_numPolygons(void * self, const KX_PYATTRIBUTE_DEF * attrdef);
 };
 
-#endif // WITH_PYTHON
-
-#endif //__KX_MESHPROXY_H__
+#endif  /* WITH_PYTHON */
 
+#endif  /* __KX_MESHPROXY_H__ */
diff --git a/source/gameengine/Ketsji/KX_MotionState.h b/source/gameengine/Ketsji/KX_MotionState.h
index 3bead93cbda..116e62f408f 100644
--- a/source/gameengine/Ketsji/KX_MotionState.h
+++ b/source/gameengine/Ketsji/KX_MotionState.h
@@ -62,5 +62,4 @@ public:
 #endif
 };
 
-#endif //__KX_MOTIONSTATE_H__
-
+#endif  /* __KX_MOTIONSTATE_H__ */
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
index db9e3697492..a8376dcb4fb 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
@@ -111,7 +111,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
 	static PyObject*	pyattr_get_hit_normal(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject*	pyattr_get_hit_uv(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 		
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 	/* --------------------------------------------------------------------- */
 	SCA_IObject*	m_hitObject;
@@ -183,5 +183,4 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
 	KX_KetsjiEngine* m_kxengine;
 };
 
-#endif //__KX_MOUSESENSOR
-
+#endif  /* __KX_MOUSESENSOR */
diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.h b/source/gameengine/Ketsji/KX_NavMeshObject.h
index db35a011c16..1599361b334 100644
--- a/source/gameengine/Ketsji/KX_NavMeshObject.h
+++ b/source/gameengine/Ketsji/KX_NavMeshObject.h
@@ -74,8 +74,7 @@ public:
 	KX_PYMETHOD_DOC(KX_NavMeshObject, raycast);
 	KX_PYMETHOD_DOC(KX_NavMeshObject, draw);
 	KX_PYMETHOD_DOC_NOARGS(KX_NavMeshObject, rebuild);
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 };
 
-#endif //__KX_NAVMESHOBJECT_H__
-
+#endif  /* __KX_NAVMESHOBJECT_H__ */
diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h
index 82f523283ed..ef6e15f602f 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.h
+++ b/source/gameengine/Ketsji/KX_NearSensor.h
@@ -100,9 +100,8 @@ public:
 		return 0;
 	}
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 };
 
-#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 9a9b3dac098..a7b0b2c4ffc 100644
--- a/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
+++ b/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
@@ -77,5 +77,4 @@ 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 397234488b7..b0efee550af 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.h
@@ -218,9 +218,8 @@ public:
 		return 0;
 	}
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 };
 
-#endif //__KX_OBJECTACTUATOR_H__
-
+#endif  /* __KX_OBJECTACTUATOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.h b/source/gameengine/Ketsji/KX_ParentActuator.h
index f2f5acd3dfb..40baac6b2b2 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.h
+++ b/source/gameengine/Ketsji/KX_ParentActuator.h
@@ -84,9 +84,8 @@ public:
 	static PyObject *pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 	
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 }; /* end of class KX_ParentActuator : public SCA_PropertyActuator */
 
-#endif
-
+#endif  /* __KX_PARENTACTUATOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h b/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
index 5cebedf8c30..ca99c2e7526 100644
--- a/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
+++ b/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
@@ -39,5 +39,4 @@ enum	e_PhysicsEngine
 		UseBullet   =  5,
 };
 
-#endif //__KX_PHYSICSENGINEENUMS_H__
-
+#endif  /* __KX_PHYSICSENGINEENUMS_H__ */
diff --git a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
index a074ff9a3bd..171416c5e8f 100644
--- a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
+++ b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
@@ -49,12 +49,11 @@ public:
 	KX_PYMETHOD_VARARGS(KX_PhysicsObjectWrapper,SetAngularVelocity);
 	KX_PYMETHOD_VARARGS(KX_PhysicsObjectWrapper,SetActive);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 private:
 	class PHY_IPhysicsController*	m_ctrl;
 	PHY_IPhysicsEnvironment* m_physenv;
 };
 
-#endif //__KX_PHYSICSOBJECTWRAPPER_H__
-
+#endif  /* __KX_PHYSICSOBJECTWRAPPER_H__ */
diff --git a/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h b/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
index 86ba2500763..ee685edb9c1 100644
--- a/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
+++ b/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
@@ -58,5 +58,4 @@ struct KX_MaterialProps {
 	bool      m_fh_normal;             // Should the object slide off slopes?
 };
 
-#endif //__KX_PHYSICSPROPERTIESOBSOLETE_H__
-
+#endif  /* __KX_PHYSICSPROPERTIESOBSOLETE_H__ */
diff --git a/source/gameengine/Ketsji/KX_PolyProxy.h b/source/gameengine/Ketsji/KX_PolyProxy.h
index 9e3556a03f8..f02aa90998e 100644
--- a/source/gameengine/Ketsji/KX_PolyProxy.h
+++ b/source/gameengine/Ketsji/KX_PolyProxy.h
@@ -80,7 +80,6 @@ public:
 
 };
 
-#endif // WITH_PYTHON
-
-#endif //__KX_POLYPROXY
+#endif  /* WITH_PYTHON */
 
+#endif  /* __KX_POLYPROXY */
diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.h b/source/gameengine/Ketsji/KX_PolygonMaterial.h
index 6384008fb7d..89bfb4ff9fb 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.h
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.h
@@ -153,5 +153,4 @@ public:
 
 };
 
-#endif // __KX_POLYGONMATERIAL_H__
-
+#endif  /* __KX_POLYGONMATERIAL_H__ */
diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.h b/source/gameengine/Ketsji/KX_PyConstraintBinding.h
index 69a6e333cee..b4a520ce71b 100644
--- a/source/gameengine/Ketsji/KX_PyConstraintBinding.h
+++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.h
@@ -39,7 +39,6 @@
 PyObject*				initPythonConstraintBinding();
 void	PHY_SetActiveEnvironment(class	PHY_IPhysicsEnvironment* env);
 PHY_IPhysicsEnvironment*	PHY_GetActiveEnvironment();
-#endif // WITH_PYTHON
-
-#endif //__KX_PYCONSTRAINTBINDING_H__
+#endif  /* WITH_PYTHON */
 
+#endif  /* __KX_PYCONSTRAINTBINDING_H__ */
diff --git a/source/gameengine/Ketsji/KX_PyMath.h b/source/gameengine/Ketsji/KX_PyMath.h
index d79397ed807..159506946e8 100644
--- a/source/gameengine/Ketsji/KX_PyMath.h
+++ b/source/gameengine/Ketsji/KX_PyMath.h
@@ -273,4 +273,4 @@ PyObject *PyObjectFrom(const MT_Tuple4 &pos);
 
 #endif
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h
index 69517b2b1e9..859c31adcd3 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.h
+++ b/source/gameengine/Ketsji/KX_PythonInit.h
@@ -89,5 +89,4 @@ void		KX_RasterizerDrawDebugCircle(const MT_Vector3& center, const MT_Scalar rad
                                          const MT_Vector3& normal, int nsector);
 
 
-#endif //__KX_PYTHONINIT_H__
-
+#endif  /* __KX_PYTHONINIT_H__ */
diff --git a/source/gameengine/Ketsji/KX_PythonSeq.h b/source/gameengine/Ketsji/KX_PythonSeq.h
index 47a01737cdb..568d59119c0 100644
--- a/source/gameengine/Ketsji/KX_PythonSeq.h
+++ b/source/gameengine/Ketsji/KX_PythonSeq.h
@@ -30,8 +30,8 @@
  *  \brief Readonly sequence wrapper for lookups on logic bricks
  */
  
-#ifndef _adr_py_seq_h_				// only process once,
-#define _adr_py_seq_h_				// even if multiply included
+#ifndef __KX_PYTHONSEQ_H__
+#define __KX_PYTHONSEQ_H__
 
 #ifdef WITH_PYTHON
 
@@ -63,6 +63,6 @@ typedef struct {
 
 PyObject *KX_PythonSeq_CreatePyObject(PyObject *base, short type);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
-#endif // _adr_py_seq_h_
+#endif  /* __KX_PYTHONSEQ_H__ */
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.h b/source/gameengine/Ketsji/KX_RadarSensor.h
index 2de58f8b3a0..6a2d50ffa3a 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.h
+++ b/source/gameengine/Ketsji/KX_RadarSensor.h
@@ -97,5 +97,4 @@ public:
 #endif
 };
 
-#endif //__KX_RADARSENSOR_H__
-
+#endif  /* __KX_RADARSENSOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_RayEventManager.h b/source/gameengine/Ketsji/KX_RayEventManager.h
index f795495d1c9..07506b9e32b 100644
--- a/source/gameengine/Ketsji/KX_RayEventManager.h
+++ b/source/gameengine/Ketsji/KX_RayEventManager.h
@@ -50,5 +50,4 @@ public:
 #endif
 };
 
-#endif //__KX_RAYEVENTMANAGER_H__
-
+#endif  /* __KX_RAYEVENTMANAGER_H__ */
diff --git a/source/gameengine/Ketsji/KX_RaySensor.h b/source/gameengine/Ketsji/KX_RaySensor.h
index 27aaa442dcd..9d40fb55747 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.h
+++ b/source/gameengine/Ketsji/KX_RaySensor.h
@@ -96,9 +96,8 @@ public:
 	/* Attributes */
 	static PyObject *pyattr_get_hitobject(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 };
 
-#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 9c8cbfa3d09..7dac93acd21 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
@@ -126,9 +126,8 @@ public:
 	static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 	static PyObject *pyattr_get_objectLastCreated(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 }; /* end of class KX_SCA_AddObjectActuator : public KX_EditObjectActuator */
 
-#endif
-
+#endif  /* __KX_SCA_ADDOBJECTACTUATOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
index 52a20142442..4370b5d4a4f 100644
--- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
@@ -89,9 +89,8 @@ class KX_SCA_ReplaceMeshActuator : public SCA_IActuator
 
 	KX_PYMETHOD_DOC(KX_SCA_ReplaceMeshActuator,instantReplaceMesh);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 }; 
 
-#endif
-
+#endif  /* __KX_SCA_REPLACEMESHACTUATOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index bb329da99de..c2e468e6da6 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -665,5 +665,4 @@ 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 0b633334cce..389e9208ef3 100644
--- a/source/gameengine/Ketsji/KX_SceneActuator.h
+++ b/source/gameengine/Ketsji/KX_SceneActuator.h
@@ -102,9 +102,8 @@ class KX_SceneActuator : public SCA_IActuator
 	static PyObject *pyattr_get_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int pyattr_set_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 }; /* end of class KXSceneActuator */
 
 #endif
-
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h
index fcaf214dd90..1ce44e942e8 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.h
+++ b/source/gameengine/Ketsji/KX_SoundActuator.h
@@ -122,9 +122,8 @@ public:
 	static PyObject *pyattr_get_type(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static PyObject *pyattr_get_sound(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 };
 
-#endif //__KX_SOUNDACTUATOR_H__
-
+#endif  /* __KX_SOUNDACTUATOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.h b/source/gameengine/Ketsji/KX_SteeringActuator.h
index 341421d8948..1e8ac9a54f0 100644
--- a/source/gameengine/Ketsji/KX_SteeringActuator.h
+++ b/source/gameengine/Ketsji/KX_SteeringActuator.h
@@ -114,9 +114,8 @@ public:
 	static PyObject *pyattr_get_steeringVec(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 }; /* end of class KX_SteeringActuator : public SCA_PropertyActuator */
 
-#endif
-
+#endif  /* __KX_STEERINGACTUATOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_TimeCategoryLogger.h b/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
index ea780739695..d167d0addfe 100644
--- a/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
+++ b/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
@@ -133,5 +133,4 @@ protected:
 #endif
 };
 
-#endif // __KX_TIMECATEGORYLOGGER_H__
-
+#endif  /* __KX_TIMECATEGORYLOGGER_H__ */
diff --git a/source/gameengine/Ketsji/KX_TimeLogger.h b/source/gameengine/Ketsji/KX_TimeLogger.h
index 83c934ea81b..bafc27b504c 100644
--- a/source/gameengine/Ketsji/KX_TimeLogger.h
+++ b/source/gameengine/Ketsji/KX_TimeLogger.h
@@ -111,5 +111,4 @@ protected:
 #endif
 };
 
-#endif // __KX_TIMELOGGER_H__
-
+#endif  /* __KX_TIMELOGGER_H__ */
diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.h b/source/gameengine/Ketsji/KX_TouchEventManager.h
index d9a0164fd05..63e9d15959e 100644
--- a/source/gameengine/Ketsji/KX_TouchEventManager.h
+++ b/source/gameengine/Ketsji/KX_TouchEventManager.h
@@ -85,5 +85,4 @@ public:
 #endif
 };
 
-#endif //__KX_TOUCHEVENTMANAGER_H__
-
+#endif  /* __KX_TOUCHEVENTMANAGER_H__ */
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h
index c80b8598e43..6bd606db8eb 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.h
+++ b/source/gameengine/Ketsji/KX_TouchSensor.h
@@ -134,5 +134,4 @@ public:
 	
 };
 
-#endif //__KX_TOUCHSENSOR_H__
-
+#endif  /* __KX_TOUCHSENSOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.h b/source/gameengine/Ketsji/KX_TrackToActuator.h
index 6329c7b34d9..f5f5c4c2836 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.h
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.h
@@ -77,9 +77,8 @@ class KX_TrackToActuator : public SCA_IActuator
 	static PyObject *pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int       pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 	
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 }; /* end of class KX_TrackToActuator : public KX_EditObjectActuator */
 
-#endif
-
+#endif  /* __KX_TRACKTOACTUATOR_H__ */
diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.h b/source/gameengine/Ketsji/KX_VehicleWrapper.h
index 3684019277c..ccd666e84f3 100644
--- a/source/gameengine/Ketsji/KX_VehicleWrapper.h
+++ b/source/gameengine/Ketsji/KX_VehicleWrapper.h
@@ -52,11 +52,11 @@ public:
 	KX_PYMETHOD_VARARGS(KX_VehicleWrapper,SetSuspensionCompression);
 	
 	KX_PYMETHOD_VARARGS(KX_VehicleWrapper,SetRollInfluence);
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 private:
 	PHY_IVehicle*			 m_vehicle;
 	PHY_IPhysicsEnvironment* m_physenv;
 };
 
-#endif //__KX_VEHICLEWRAPPER_H__
+#endif  /* __KX_VEHICLEWRAPPER_H__ */
diff --git a/source/gameengine/Ketsji/KX_VertexProxy.h b/source/gameengine/Ketsji/KX_VertexProxy.h
index f56e2be26a3..6e193d35b4c 100644
--- a/source/gameengine/Ketsji/KX_VertexProxy.h
+++ b/source/gameengine/Ketsji/KX_VertexProxy.h
@@ -105,7 +105,6 @@ public:
 
 };
 
-#endif // WITH_PYTHON
-
-#endif //__KX_VERTEXPROXY_H__
+#endif  /* WITH_PYTHON */
 
+#endif  /* __KX_VERTEXPROXY_H__ */
diff --git a/source/gameengine/Ketsji/KX_WorldInfo.h b/source/gameengine/Ketsji/KX_WorldInfo.h
index 5b35ca2ec54..a64ca5c191e 100644
--- a/source/gameengine/Ketsji/KX_WorldInfo.h
+++ b/source/gameengine/Ketsji/KX_WorldInfo.h
@@ -74,5 +74,4 @@ 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 575d4e72f14..63983b3129b 100644
--- a/source/gameengine/Ketsji/KX_WorldIpoController.h
+++ b/source/gameengine/Ketsji/KX_WorldIpoController.h
@@ -100,5 +100,4 @@ public:
 #endif
 };
 
-#endif // __KX_WORLDIPOCONTROLLER_H__
-
+#endif  /* __KX_WORLDIPOCONTROLLER_H__ */
diff --git a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
index f9d2146a766..7581486c80a 100644
--- a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
+++ b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
@@ -60,5 +60,4 @@ 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 8f903cc64fa..48edbdfc7fe 100644
--- a/source/gameengine/Network/NG_NetworkDeviceInterface.h
+++ b/source/gameengine/Network/NG_NetworkDeviceInterface.h
@@ -79,5 +79,4 @@ 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 25e7fd97596..5185849f8d7 100644
--- a/source/gameengine/Network/NG_NetworkMessage.h
+++ b/source/gameengine/Network/NG_NetworkMessage.h
@@ -135,5 +135,4 @@ 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 b9858cd8d43..54459cad55d 100644
--- a/source/gameengine/Network/NG_NetworkObject.h
+++ b/source/gameengine/Network/NG_NetworkObject.h
@@ -52,5 +52,4 @@ 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 381b71da0d7..10dad210128 100644
--- a/source/gameengine/Network/NG_NetworkScene.h
+++ b/source/gameengine/Network/NG_NetworkScene.h
@@ -115,5 +115,4 @@ protected:
 #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 15edfeb5759..72eb699ce5b 100644
--- a/source/gameengine/Physics/Bullet/CcdGraphicController.h
+++ b/source/gameengine/Physics/Bullet/CcdGraphicController.h
@@ -87,4 +87,4 @@ private:
 #endif
 };
 
-#endif //BULLET2_PHYSICSCONTROLLER_H
+#endif  /* BULLET2_PHYSICSCONTROLLER_H */
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 2204f224e7d..6df5c85f5c0 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -665,4 +665,4 @@ class	DefaultMotionState : public PHY_IMotionState
 };
 
 
-#endif //__CCDPHYSICSCONTROLLER_H__
+#endif  /* __CCDPHYSICSCONTROLLER_H__ */
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index 453380b69ca..350ecd2588a 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -183,7 +183,7 @@ protected:
 		{
 			return 0;
 		}
-#endif //NEW_BULLET_VEHICLE_SUPPORT
+#endif  /* NEW_BULLET_VEHICLE_SUPPORT */
 
 		btTypedConstraint*	getConstraintById(int constraintId);
 
@@ -297,4 +297,4 @@ protected:
 #endif
 };
 
-#endif //__CCDPHYSICSENVIRONMENT_H__
+#endif  /* __CCDPHYSICSENVIRONMENT_H__ */
diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
index 4ddfe4d69e0..70de9c25553 100644
--- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
@@ -102,5 +102,4 @@ public:
 #endif
 };
 
-#endif //__DUMMYPHYSICSENVIRONMENT_H__
-
+#endif  /* __DUMMYPHYSICSENVIRONMENT_H__ */
diff --git a/source/gameengine/Physics/common/PHY_DynamicTypes.h b/source/gameengine/Physics/common/PHY_DynamicTypes.h
index 6994706ce2d..0fe2533cf93 100644
--- a/source/gameengine/Physics/common/PHY_DynamicTypes.h
+++ b/source/gameengine/Physics/common/PHY_DynamicTypes.h
@@ -151,4 +151,4 @@ typedef enum PHY_ShapeType {
 
 typedef float	PHY_Vector3[3];
 
-#endif //__PHY_DYNAMICTYPES_H__
+#endif  /* __PHY_DYNAMICTYPES_H__ */
diff --git a/source/gameengine/Physics/common/PHY_IController.h b/source/gameengine/Physics/common/PHY_IController.h
index 729abd8ec04..003c4edf598 100644
--- a/source/gameengine/Physics/common/PHY_IController.h
+++ b/source/gameengine/Physics/common/PHY_IController.h
@@ -60,5 +60,4 @@ class PHY_IController
 #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 af337188818..cb13eda4f18 100644
--- a/source/gameengine/Physics/common/PHY_IGraphicController.h
+++ b/source/gameengine/Physics/common/PHY_IGraphicController.h
@@ -58,5 +58,4 @@ 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 72ff37468ee..ccf7cf74724 100644
--- a/source/gameengine/Physics/common/PHY_IMotionState.h
+++ b/source/gameengine/Physics/common/PHY_IMotionState.h
@@ -65,5 +65,4 @@ class	PHY_IMotionState
 #endif
 };
 
-#endif //__PHY_IMOTIONSTATE_H__
-
+#endif  /* __PHY_IMOTIONSTATE_H__ */
diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.h b/source/gameengine/Physics/common/PHY_IPhysicsController.h
index 7eea2a183a1..bc7671abe80 100644
--- a/source/gameengine/Physics/common/PHY_IPhysicsController.h
+++ b/source/gameengine/Physics/common/PHY_IPhysicsController.h
@@ -108,5 +108,4 @@ class PHY_IPhysicsController : public PHY_IController
 #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 77016859c3f..66ca037aa47 100644
--- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
+++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
@@ -185,5 +185,4 @@ class PHY_IPhysicsEnvironment
 #endif
 };
 
-#endif //__PHY_IPHYSICSENVIRONMENT_H__
-
+#endif  /* __PHY_IPHYSICSENVIRONMENT_H__ */
diff --git a/source/gameengine/Physics/common/PHY_IVehicle.h b/source/gameengine/Physics/common/PHY_IVehicle.h
index 731e22d9f0f..ecf7a87c40f 100644
--- a/source/gameengine/Physics/common/PHY_IVehicle.h
+++ b/source/gameengine/Physics/common/PHY_IVehicle.h
@@ -66,4 +66,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 b930177d3a8..7c5d9c9638e 100644
--- a/source/gameengine/Physics/common/PHY_Pro.h
+++ b/source/gameengine/Physics/common/PHY_Pro.h
@@ -62,5 +62,4 @@ struct PHY_MaterialProps {
 	bool      m_fh_normal;             // Should the object slide off slopes?
 };
 
-#endif //__PHY_PRO_H__
-
+#endif  /* __PHY_PRO_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.h b/source/gameengine/Rasterizer/RAS_BucketManager.h
index 2650bc9f722..c85a9f65d27 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.h
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.h
@@ -90,5 +90,4 @@ private:
 #endif
 };
 
-#endif //__RAS_BUCKETMANAGER_H__
-
+#endif  /* __RAS_BUCKETMANAGER_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_CameraData.h b/source/gameengine/Rasterizer/RAS_CameraData.h
index 4a70df6e505..7a6bb541a1a 100644
--- a/source/gameengine/Rasterizer/RAS_CameraData.h
+++ b/source/gameengine/Rasterizer/RAS_CameraData.h
@@ -71,5 +71,4 @@ 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 d70e56dc285..6042a7dc4b5 100644
--- a/source/gameengine/Rasterizer/RAS_Deformer.h
+++ b/source/gameengine/Rasterizer/RAS_Deformer.h
@@ -34,7 +34,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 #include <stdlib.h>
 #include "CTR_Map.h"
diff --git a/source/gameengine/Rasterizer/RAS_ICanvas.h b/source/gameengine/Rasterizer/RAS_ICanvas.h
index f045eb7e423..53195d79768 100644
--- a/source/gameengine/Rasterizer/RAS_ICanvas.h
+++ b/source/gameengine/Rasterizer/RAS_ICanvas.h
@@ -231,5 +231,4 @@ protected:
 #endif
 };
 
-#endif //__RAS_ICANVAS_H__
-
+#endif  /* __RAS_ICANVAS_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
index 169bc6e4ee6..9fffc8bebc9 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
@@ -202,5 +202,4 @@ inline  bool operator < ( const RAS_IPolyMaterial & lhs, const RAS_IPolyMaterial
 	return lhs.Less(rhs);
 }
 
-#endif //__RAS_IPOLYGONMATERIAL_H__
-
+#endif  /* __RAS_IPOLYGONMATERIAL_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h
index 8efc10f2118..f212b1e6e0b 100644
--- a/source/gameengine/Rasterizer/RAS_IRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h
@@ -423,6 +423,4 @@ public:
 #endif
 };
 
-#endif //__RAS_IRASTERIZER_H__
-
-
+#endif  /* __RAS_IRASTERIZER_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_IRenderTools.h b/source/gameengine/Rasterizer/RAS_IRenderTools.h
index ca6f20b71ad..bccda634222 100644
--- a/source/gameengine/Rasterizer/RAS_IRenderTools.h
+++ b/source/gameengine/Rasterizer/RAS_IRenderTools.h
@@ -208,7 +208,4 @@ public:
 #endif
 };
 
-#endif //__RAS_IRENDERTOOLS_H__
-
-
-
+#endif  /* __RAS_IRENDERTOOLS_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_LightObject.h b/source/gameengine/Rasterizer/RAS_LightObject.h
index ddf360683cd..79818def5f0 100644
--- a/source/gameengine/Rasterizer/RAS_LightObject.h
+++ b/source/gameengine/Rasterizer/RAS_LightObject.h
@@ -64,5 +64,4 @@ 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 295f2510313..16ecffb9a32 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
@@ -254,4 +254,4 @@ private:
 #endif
 };
 
-#endif //__RAS_MATERIAL_BUCKET
+#endif  /* __RAS_MATERIAL_BUCKET */
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index eb8655c8b1f..99ed59f6057 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -177,5 +177,4 @@ public:
 #endif
 };
 
-#endif //__RAS_MESHOBJECT_H__
-
+#endif  /* __RAS_MESHOBJECT_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_ObjectColor.h b/source/gameengine/Rasterizer/RAS_ObjectColor.h
index f8fbe69e97b..77feffccffc 100644
--- a/source/gameengine/Rasterizer/RAS_ObjectColor.h
+++ b/source/gameengine/Rasterizer/RAS_ObjectColor.h
@@ -38,5 +38,4 @@ struct	RAS_ObjectColor {
 	float	m_blue;
 };
 
-#endif //__RAS_OBJECTCOLOR_H__
-
+#endif  /* __RAS_OBJECTCOLOR_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
index 8b54f507ee0..e6d16378bcf 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
@@ -322,6 +322,4 @@ public:
 #endif
 };
 
-#endif //__RAS_OPENGLRASTERIZER_H__
-
-
+#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 e881192171f..6b159db05ed 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
@@ -67,5 +67,4 @@ private:
 #endif
 };
 
-#endif //__RAS_VAOPENGLRASTERIZER_H__
-
+#endif  /* __RAS_VAOPENGLRASTERIZER_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_Rect.h b/source/gameengine/Rasterizer/RAS_Rect.h
index cb5f7d47457..fc99c9159db 100644
--- a/source/gameengine/Rasterizer/RAS_Rect.h
+++ b/source/gameengine/Rasterizer/RAS_Rect.h
@@ -101,5 +101,4 @@ public:
 #endif
 };
 
-#endif // __RAS_RECT_H__
-
+#endif  /* __RAS_RECT_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_TexMatrix.h b/source/gameengine/Rasterizer/RAS_TexMatrix.h
index 44ae1b0eb5d..a2dd291d016 100644
--- a/source/gameengine/Rasterizer/RAS_TexMatrix.h
+++ b/source/gameengine/Rasterizer/RAS_TexMatrix.h
@@ -39,5 +39,4 @@
 
 void RAS_CalcTexMatrix(RAS_TexVert p[3],MT_Point3& origin,MT_Vector3& udir,MT_Vector3& vdir);
 
-#endif //__RAS_TEXMATRIX_H__
-
+#endif  /* __RAS_TEXMATRIX_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.h b/source/gameengine/Rasterizer/RAS_TexVert.h
index 15059a9cf12..889769da5ed 100644
--- a/source/gameengine/Rasterizer/RAS_TexVert.h
+++ b/source/gameengine/Rasterizer/RAS_TexVert.h
@@ -148,5 +148,4 @@ public:
 #endif
 };
 
-#endif //__RAS_TEXVERT_H__
-
+#endif  /* __RAS_TEXVERT_H__ */
diff --git a/source/gameengine/SceneGraph/SG_Controller.h b/source/gameengine/SceneGraph/SG_Controller.h
index 455aaf90d6d..a173633e13c 100644
--- a/source/gameengine/SceneGraph/SG_Controller.h
+++ b/source/gameengine/SceneGraph/SG_Controller.h
@@ -121,5 +121,4 @@ protected:
 #endif
 };
 
-#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 be1c1fda2f2..90153f14c07 100644
--- a/source/gameengine/SceneGraph/SG_DList.h
+++ b/source/gameengine/SceneGraph/SG_DList.h
@@ -248,5 +248,4 @@ public:
 
 };
 
-#endif //__SG_DLIST_H__
-
+#endif  /* __SG_DLIST_H__ */
diff --git a/source/gameengine/SceneGraph/SG_IObject.h b/source/gameengine/SceneGraph/SG_IObject.h
index 53b51507e97..885eb8e1e90 100644
--- a/source/gameengine/SceneGraph/SG_IObject.h
+++ b/source/gameengine/SceneGraph/SG_IObject.h
@@ -371,5 +371,4 @@ protected :
 #endif
 };
 
-#endif //__SG_IOBJECT_H__
-
+#endif  /* __SG_IOBJECT_H__ */
diff --git a/source/gameengine/SceneGraph/SG_Node.h b/source/gameengine/SceneGraph/SG_Node.h
index 063eeaab01d..bde64f21305 100644
--- a/source/gameengine/SceneGraph/SG_Node.h
+++ b/source/gameengine/SceneGraph/SG_Node.h
@@ -275,5 +275,4 @@ private:
 #endif
 };
 
-#endif //__SG_NODE_H__
-
+#endif  /* __SG_NODE_H__ */
diff --git a/source/gameengine/SceneGraph/SG_QList.h b/source/gameengine/SceneGraph/SG_QList.h
index bcc56f05615..663f29ebd88 100644
--- a/source/gameengine/SceneGraph/SG_QList.h
+++ b/source/gameengine/SceneGraph/SG_QList.h
@@ -161,5 +161,4 @@ public:
 #endif
 };
 
-#endif //__SG_QLIST_H__
-
+#endif  /* __SG_QLIST_H__ */
diff --git a/source/gameengine/SceneGraph/SG_Spatial.h b/source/gameengine/SceneGraph/SG_Spatial.h
index 7630af51781..aa917fa70db 100644
--- a/source/gameengine/SceneGraph/SG_Spatial.h
+++ b/source/gameengine/SceneGraph/SG_Spatial.h
@@ -291,5 +291,4 @@ protected:
 #endif
 };
 
-#endif //__SG_SPATIAL_H__
-
+#endif  /* __SG_SPATIAL_H__ */
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.h b/source/gameengine/VideoTexture/VideoFFmpeg.h
index cd0edfc09ef..d5b575851ee 100644
--- a/source/gameengine/VideoTexture/VideoFFmpeg.h
+++ b/source/gameengine/VideoTexture/VideoFFmpeg.h
@@ -209,6 +209,6 @@ inline VideoFFmpeg *getFFmpeg(PyImage *self)
 	return static_cast<VideoFFmpeg*>(self->m_image); 
 }
 
-#endif	//WITH_FFMPEG
+#endif  /* WITH_FFMPEG */
 
-#endif
+#endif  /* __VIDEOFFMPEG_H__ */