Replace header guards in source folder to avoid using identifiers reserved by c++

Basically fixing original Bug#427 reported by MArkus Elfring.
Unfortunately there are still more defines (in IrrCompileConfig.h) which also are not nice c++
Lots of files touched for very minor cleanup *sigh*

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6253 dfc29bdd-3216-0410-991c-e03cc46cb475

changes.txt

@@ -4,6 +4,7 @@ Changes in 1.9 (not yet released)
   Mostly it's about replacing __IRRxxx or _IRRxxx identifiers by versions without underscores
   Sometimes underscores at end also got removed.
   There is a header file irrLegacyDefines.h which can be included to allow having the old defines back.
+  Thanks @Markus Elfring  for reporting this (bug #427)
 - Add equals and set_data functions to core::array for easier working with blocks of data.
 - SIrrlichtCreationParameters::IgnoreInput set to false works again on X11. 
   Thanks @ Victor Gaydov for report + patch + very good test cases! (bug #401)

source/Irrlicht/C3DSMeshFileLoader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_3DS_MESH_FILE_LOADER_H_INCLUDED__
-#define __C_3DS_MESH_FILE_LOADER_H_INCLUDED__
+#ifndef IRR_C_3DS_MESH_FILE_LOADER_H_INCLUDED
+#define IRR_C_3DS_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 #include "IFileSystem.h"
@@ -163,4 +163,3 @@ private:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CAnimatedMeshHalfLife.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_ANIMATED_MESH_HALFLIFE_H_INCLUDED__
-#define __C_ANIMATED_MESH_HALFLIFE_H_INCLUDED__
+#ifndef IRR_C_ANIMATED_MESH_HALFLIFE_H_INCLUDED
+#define IRR_C_ANIMATED_MESH_HALFLIFE_H_INCLUDED
 
 #include "IAnimatedMesh.h"
 #include "ISceneManager.h"
@@ -627,4 +627,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CAnimatedMeshMD2.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_ANIMATED_MESH_MD2_H_INCLUDED__
-#define __C_ANIMATED_MESH_MD2_H_INCLUDED__
+#ifndef IRR_C_ANIMATED_MESH_MD2_H_INCLUDED
+#define IRR_C_ANIMATED_MESH_MD2_H_INCLUDED
 
 #include "IAnimatedMeshMD2.h"
 #include "IMesh.h"
@@ -155,4 +155,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CAnimatedMeshMD3.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_ANIMATED_MESH_MD3_H_INCLUDED__
-#define __C_ANIMATED_MESH_MD3_H_INCLUDED__
+#ifndef IRR_C_ANIMATED_MESH_MD3_H_INCLUDED
+#define IRR_C_ANIMATED_MESH_MD3_H_INCLUDED
 
 #include "IAnimatedMeshMD3.h"
 #include "IReadFile.h"
@@ -132,4 +132,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CAnimatedMeshSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
-#define __C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED
+#define IRR_C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED
 
 #include "IAnimatedMeshSceneNode.h"
 #include "IAnimatedMesh.h"
@@ -220,4 +220,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CAttributes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_ATTRIBUTES_H_INCLUDED__
-#define __C_ATTRIBUTES_H_INCLUDED__
+#ifndef IRR_C_ATTRIBUTES_H_INCLUDED
+#define IRR_C_ATTRIBUTES_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -735,4 +735,3 @@ protected:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CB3DMeshFileLoader.h

@@ -8,8 +8,8 @@
 
 #include "IrrCompileConfig.h"
 
-#ifndef __C_B3D_MESH_LOADER_H_INCLUDED__
-#define __C_B3D_MESH_LOADER_H_INCLUDED__
+#ifndef IRR_C_B3D_MESH_LOADER_H_INCLUDED
+#define IRR_C_B3D_MESH_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 #include "ISceneManager.h"
@@ -87,5 +87,4 @@ private:
 } // end namespace scene
 } // end namespace irr
 
-#endif // __C_B3D_MESH_LOADER_H_INCLUDED__
-
+#endif // IRR_C_B3D_MESH_LOADER_H_INCLUDED

source/Irrlicht/CBSPMeshFileLoader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_BSP_MESH_FILE_LOADER_H_INCLUDED__
-#define __C_BSP_MESH_FILE_LOADER_H_INCLUDED__
+#ifndef IRR_C_BSP_MESH_FILE_LOADER_H_INCLUDED
+#define IRR_C_BSP_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 #include "IFileSystem.h"
@@ -49,4 +49,3 @@ private:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CBillboardSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_BILLBOARD_SCENE_NODE_H_INCLUDED__
-#define __C_BILLBOARD_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_C_BILLBOARD_SCENE_NODE_H_INCLUDED
+#define IRR_C_BILLBOARD_SCENE_NODE_H_INCLUDED
 
 #include "IBillboardSceneNode.h"
 #include "SMeshBuffer.h"
@@ -109,4 +109,3 @@ private:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CBoneSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_BONE_SCENE_NODE_H_INCLUDED__
-#define __C_BONE_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_C_BONE_SCENE_NODE_H_INCLUDED
+#define IRR_C_BONE_SCENE_NODE_H_INCLUDED
 
 // Used with SkinnedMesh and IAnimatedMeshSceneNode, for boned meshes
 
@@ -76,4 +76,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CCameraSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_CAMERA_SCENE_NODE_H_INCLUDED__
-#define __C_CAMERA_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_C_CAMERA_SCENE_NODE_H_INCLUDED
+#define IRR_C_CAMERA_SCENE_NODE_H_INCLUDED
 
 #include "ICameraSceneNode.h"
 #include "SViewFrustum.h"
@@ -176,4 +176,3 @@ namespace scene
 } // end namespace
 
 #endif
-

source/Irrlicht/CColladaFileLoader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_COLLADA_MESH_FILE_LOADER_H_INCLUDED__
-#define __C_COLLADA_MESH_FILE_LOADER_H_INCLUDED__
+#ifndef IRR_C_COLLADA_MESH_FILE_LOADER_H_INCLUDED
+#define IRR_C_COLLADA_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 #include "IFileSystem.h"
@@ -407,4 +407,3 @@ public:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CColorConverter.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_COLOR_CONVERTER_H_INCLUDED__
-#define __C_COLOR_CONVERTER_H_INCLUDED__
+#ifndef IRR_C_COLOR_CONVERTER_H_INCLUDED
+#define IRR_C_COLOR_CONVERTER_H_INCLUDED
 
 #include "irrTypes.h"
 #include "IImage.h"
@@ -95,4 +95,3 @@ public:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CCubeSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_CUBE_SCENE_NODE_H_INCLUDED__
-#define __C_CUBE_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_C_CUBE_SCENE_NODE_H_INCLUDED
+#define IRR_C_CUBE_SCENE_NODE_H_INCLUDED
 
 #include "IMeshSceneNode.h"
 #include "SMesh.h"
@@ -90,4 +90,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CD3D9Driver.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_VIDEO_DIRECTX_9_H_INCLUDED__
-#define __C_VIDEO_DIRECTX_9_H_INCLUDED__
+#ifndef IRR_C_VIDEO_DIRECTX_9_H_INCLUDED
+#define IRR_C_VIDEO_DIRECTX_9_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -506,7 +506,5 @@ namespace video
 } // end namespace video
 } // end namespace irr
 
-
 #endif // _IRR_COMPILE_WITH_DIRECT3D_9_
-#endif // __C_VIDEO_DIRECTX_9_H_INCLUDED__
-
+#endif // IRR_C_VIDEO_DIRECTX_9_H_INCLUDED

source/Irrlicht/CD3D9HLSLMaterialRenderer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED__
+#ifndef IRR_C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED
+#define IRR_C_D3D9_HLSL_MATERIAL_RENDERER_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_WINDOWS_
@@ -84,4 +84,3 @@ protected:
 #endif
 #endif
 #endif
-

source/Irrlicht/CD3D9MaterialRenderer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_D3D9_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_D3D9_MATERIAL_RENDERER_H_INCLUDED__
+#ifndef IRR_C_D3D9_MATERIAL_RENDERER_H_INCLUDED
+#define IRR_C_D3D9_MATERIAL_RENDERER_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_WINDOWS_
@@ -581,4 +581,3 @@ public:
 #endif
 #endif
 #endif
-

source/Irrlicht/CD3D9NormalMapRenderer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED__
-#define __C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED__
+#ifndef IRR_C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED
+#define IRR_C_D3D9_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_WINDOWS_
@@ -53,4 +53,3 @@ private:
 #endif
 #endif
 #endif
-

source/Irrlicht/CD3D9ParallaxMapRenderer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED__
-#define __C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED__
+#ifndef IRR_C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED
+#define IRR_C_D3D9_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_WINDOWS_
@@ -60,4 +60,3 @@ private:
 #endif
 #endif
 #endif
-

source/Irrlicht/CD3D9RenderTarget.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OPEN_GL_RENDER_TARGET_H_INCLUDED__
-#define __C_OPEN_GL_RENDER_TARGET_H_INCLUDED__
+#ifndef IRR_C_OPEN_GL_RENDER_TARGET_H_INCLUDED
+#define IRR_C_OPEN_GL_RENDER_TARGET_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 

source/Irrlicht/CD3D9ShaderMaterialRenderer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED__
+#ifndef IRR_C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED
+#define IRR_C_D3D9_SHADER_MATERIAL_RENDERER_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_WINDOWS_
@@ -105,4 +105,3 @@ protected:
 #endif
 #endif
 #endif
-

source/Irrlicht/CD3D9Texture.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_DIRECTX9_TEXTURE_H_INCLUDED__
-#define __C_DIRECTX9_TEXTURE_H_INCLUDED__
+#ifndef IRR_C_DIRECTX9_TEXTURE_H_INCLUDED
+#define IRR_C_DIRECTX9_TEXTURE_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_

source/Irrlicht/CDMFLoader.h

@@ -27,8 +27,8 @@
   credits to others for parts of this code.
 */
 
-#ifndef __C_DMF_LOADER_H_INCLUDED__
-#define __C_DMF_LOADER_H_INCLUDED__
+#ifndef IRR_C_DMF_LOADER_H_INCLUDED
+#define IRR_C_DMF_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 #include "IReadFile.h"
@@ -88,4 +88,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CDefaultGUIElementFactory.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__
-#define __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__
+#ifndef IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED
+#define IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -67,4 +67,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__
+#endif // IRR_C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED

source/Irrlicht/CDefaultSceneNodeAnimatorFactory.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__
-#define __C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED__
+#ifndef IRR_C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED
+#define IRR_C_DEFAULT_SCENE_NODE_ANIMATOR_FACTORY_H_INCLUDED
 
 #include "ISceneNodeAnimatorFactory.h"
 
@@ -72,4 +72,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CDefaultSceneNodeFactory.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED__
-#define __C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED__
+#ifndef IRR_C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED
+#define IRR_C_DEFAULT_SCENE_NODE_FACTORY_H_INCLUDED
 
 #include "ISceneNodeFactory.h"
 #include "irrArray.h"
@@ -16,7 +16,7 @@ namespace scene
 	class ISceneNode;
 	class ISceneManager;
 
-	//! Interface making it possible to dynamicly create scene nodes and animators
+	//! Interface making it possible to dynamically create scene nodes and animators
 	class CDefaultSceneNodeFactory : public ISceneNodeFactory
 	{
 	public:
@@ -77,4 +77,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CDepthBuffer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_Z_BUFFER_H_INCLUDED__
-#define __C_Z_BUFFER_H_INCLUDED__
+#ifndef IRR_C_Z_BUFFER_H_INCLUDED
+#define IRR_C_Z_BUFFER_H_INCLUDED
 
 #include "IDepthBuffer.h"
 
@@ -89,4 +89,3 @@ namespace video
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CDummyTransformationSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
-#define __C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED
+#define IRR_C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED
 
 #include "IDummyTransformationSceneNode.h"
 
@@ -59,4 +59,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CEmptySceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_EMPTY_SCENE_NODE_H_INCLUDED__
-#define __C_EMPTY_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_C_EMPTY_SCENE_NODE_H_INCLUDED
+#define IRR_C_EMPTY_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 
@@ -43,4 +43,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CFPSCounter.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_FPSCOUNTER_H_INCLUDED__
-#define __C_FPSCOUNTER_H_INCLUDED__
+#ifndef IRR_C_FPSCOUNTER_H_INCLUDED
+#define IRR_C_FPSCOUNTER_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -49,6 +49,4 @@ private:
 } // end namespace video
 } // end namespace irr
 
-
 #endif
-

source/Irrlicht/CFileList.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_FILE_LIST_H_INCLUDED__
-#define __C_FILE_LIST_H_INCLUDED__
+#ifndef IRR_C_FILE_LIST_H_INCLUDED
+#define IRR_C_FILE_LIST_H_INCLUDED
 
 #include "IFileList.h"
 #include "irrString.h"
@@ -135,4 +135,3 @@ protected:
 
 
 #endif
-

source/Irrlicht/CFileSystem.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_FILE_SYSTEM_H_INCLUDED__
-#define __C_FILE_SYSTEM_H_INCLUDED__
+#ifndef IRR_C_FILE_SYSTEM_H_INCLUDED
+#define IRR_C_FILE_SYSTEM_H_INCLUDED
 
 #include "IFileSystem.h"
 #include "irrArray.h"
@@ -176,4 +176,3 @@ private:
 } // end namespace io
 
 #endif
-

source/Irrlicht/CGLXManager.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_GLX_MANAGER_H_INCLUDED__
-#define __C_GLX_MANAGER_H_INCLUDED__
+#ifndef IRR_C_GLX_MANAGER_H_INCLUDED
+#define IRR_C_GLX_MANAGER_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -76,4 +76,3 @@ namespace video
 #endif
 
 #endif
-

source/Irrlicht/CGUIButton.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_BUTTON_H_INCLUDED__
-#define __C_GUI_BUTTON_H_INCLUDED__
+#ifndef IRR_C_GUI_BUTTON_H_INCLUDED
+#define IRR_C_GUI_BUTTON_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -252,5 +252,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_BUTTON_H_INCLUDED__
-
+#endif // IRR_C_GUI_BUTTON_H_INCLUDED

source/Irrlicht/CGUICheckBox.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_CHECKBOX_H_INCLUDED__
-#define __C_GUI_CHECKBOX_H_INCLUDED__
+#ifndef IRR_C_GUI_CHECKBOX_H_INCLUDED
+#define IRR_C_GUI_CHECKBOX_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -66,6 +66,6 @@ namespace gui
 } // end namespace gui
 } // end namespace irr
 
-#endif // __C_GUI_CHECKBOX_H_INCLUDED__
-
 #endif // _IRR_COMPILE_WITH_GUI_
+
+#endif // IRR_C_GUI_CHECKBOX_H_INCLUDED

source/Irrlicht/CGUIColorSelectDialog.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
-#define __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
+#ifndef IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED
+#define IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -71,4 +71,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
+#endif // IRR_C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED

source/Irrlicht/CGUIComboBox.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_COMBO_BOX_H_INCLUDED__
-#define __C_GUI_COMBO_BOX_H_INCLUDED__
+#ifndef IRR_C_GUI_COMBO_BOX_H_INCLUDED
+#define IRR_C_GUI_COMBO_BOX_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -115,5 +115,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_COMBO_BOX_H_INCLUDED__
-
+#endif // IRR_C_GUI_COMBO_BOX_H_INCLUDED

source/Irrlicht/CGUIContextMenu.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_CONTEXT_MENU_H_INCLUDED__
-#define __C_GUI_CONTEXT_MENU_H_INCLUDED__
+#ifndef IRR_C_GUI_CONTEXT_MENU_H_INCLUDED
+#define IRR_C_GUI_CONTEXT_MENU_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -170,5 +170,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_CONTEXT_MENU_H_INCLUDED__
-
+#endif // IRR_C_GUI_CONTEXT_MENU_H_INCLUDED

source/Irrlicht/CGUIEditBox.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_EDIT_BOX_H_INCLUDED__
-#define __C_GUI_EDIT_BOX_H_INCLUDED__
+#ifndef IRR_C_GUI_EDIT_BOX_H_INCLUDED
+#define IRR_C_GUI_EDIT_BOX_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -203,5 +203,4 @@ namespace gui
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_GUI_
-#endif // __C_GUI_EDIT_BOX_H_INCLUDED__
-
+#endif // IRR_C_GUI_EDIT_BOX_H_INCLUDED

source/Irrlicht/CGUIEnvironment.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_ENVIRONMENT_H_INCLUDED__
-#define __C_GUI_ENVIRONMENT_H_INCLUDED__
+#ifndef IRR_C_GUI_ENVIRONMENT_H_INCLUDED
+#define IRR_C_GUI_ENVIRONMENT_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -338,6 +338,4 @@ private:
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_ENVIRONMENT_H_INCLUDED__
-
-
+#endif // IRR_C_GUI_ENVIRONMENT_H_INCLUDED

source/Irrlicht/CGUIFileOpenDialog.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
-#define __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
+#ifndef IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED
+#define IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -95,5 +95,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
-
+#endif // IRR_C_GUI_FILE_OPEN_DIALOG_H_INCLUDED

source/Irrlicht/CGUIFont.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_FONT_H_INCLUDED__
-#define __C_GUI_FONT_H_INCLUDED__
+#ifndef IRR_C_GUI_FONT_H_INCLUDED
+#define IRR_C_GUI_FONT_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -118,5 +118,4 @@ private:
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_FONT_H_INCLUDED__
-
+#endif // IRR_C_GUI_FONT_H_INCLUDED

source/Irrlicht/CGUIImage.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_IMAGE_H_INCLUDED__
-#define __C_GUI_IMAGE_H_INCLUDED__
+#ifndef IRR_C_GUI_IMAGE_H_INCLUDED
+#define IRR_C_GUI_IMAGE_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -110,4 +110,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_IMAGE_H_INCLUDED__
+#endif // IRR_C_GUI_IMAGE_H_INCLUDED

source/Irrlicht/CGUIImageList.h

@@ -1,8 +1,8 @@
 // This file is part of the "Irrlicht Engine".
 // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
 
-#ifndef __C_GUI_IMAGE_LIST_H_INCLUDED__
-#define __C_GUI_IMAGE_LIST_H_INCLUDED__
+#ifndef IRR_C_GUI_IMAGE_LIST_H_INCLUDED
+#define IRR_C_GUI_IMAGE_LIST_H_INCLUDED
 
 #include "IGUIImageList.h"
 #include "IVideoDriver.h"

source/Irrlicht/CGUIInOutFader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_IN_OUT_FADER_H_INCLUDED__
-#define __C_GUI_IN_OUT_FADER_H_INCLUDED__
+#ifndef IRR_C_GUI_IN_OUT_FADER_H_INCLUDED
+#define IRR_C_GUI_IN_OUT_FADER_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -71,5 +71,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_IN_OUT_FADER_H_INCLUDED__
-
+#endif // IRR_C_GUI_IN_OUT_FADER_H_INCLUDED

source/Irrlicht/CGUIListBox.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_LIST_BOX_H_INCLUDED__
-#define __C_GUI_LIST_BOX_H_INCLUDED__
+#ifndef IRR_C_GUI_LIST_BOX_H_INCLUDED
+#define IRR_C_GUI_LIST_BOX_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_

source/Irrlicht/CGUIMenu.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_MENU_H_INCLUDED__
-#define __C_GUI_MENU_H_INCLUDED__
+#ifndef IRR_C_GUI_MENU_H_INCLUDED
+#define IRR_C_GUI_MENU_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -46,7 +46,5 @@ namespace gui
 } // end namespace gui
 } // end namespace irr
 
-
-#endif //  __C_GUI_MENU_H_INCLUDED__
 #endif // _IRR_COMPILE_WITH_GUI_
-
+#endif //  IRR_C_GUI_MENU_H_INCLUDED

source/Irrlicht/CGUIMeshViewer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_MESH_VIEWER_H_INCLUDED__
-#define __C_GUI_MESH_VIEWER_H_INCLUDED__
+#ifndef IRR_C_GUI_MESH_VIEWER_H_INCLUDED
+#define IRR_C_GUI_MESH_VIEWER_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -57,5 +57,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_MESH_VIEWER_H_INCLUDED__
-
+#endif // IRR_C_GUI_MESH_VIEWER_H_INCLUDED

source/Irrlicht/CGUIMessageBox.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_MESSAGE_BOX_H_INCLUDED__
-#define __C_GUI_MESSAGE_BOX_H_INCLUDED__
+#ifndef IRR_C_GUI_MESSAGE_BOX_H_INCLUDED
+#define IRR_C_GUI_MESSAGE_BOX_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_

source/Irrlicht/CGUIModalScreen.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_MODAL_SCREEN_H_INCLUDED__
-#define __C_GUI_MODAL_SCREEN_H_INCLUDED__
+#ifndef IRR_C_GUI_MODAL_SCREEN_H_INCLUDED
+#define IRR_C_GUI_MODAL_SCREEN_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -83,4 +83,3 @@ namespace gui
 #endif // _IRR_COMPILE_WITH_GUI_
 
 #endif
-

source/Irrlicht/CGUIProfiler.h

@@ -2,8 +2,8 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // Written by Michael Zeilfelder
 
-#ifndef C_GUI_PROFILER_H_INCLUDED__
-#define C_GUI_PROFILER_H_INCLUDED__
+#ifndef IRR_C_GUI_PROFILER_H_INCLUDED
+#define IRR_C_GUI_PROFILER_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -103,4 +103,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_IMAGE_H_INCLUDED__
+#endif

source/Irrlicht/CGUIScrollBar.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_SCROLL_BAR_H_INCLUDED__
-#define __C_GUI_SCROLL_BAR_H_INCLUDED__
+#ifndef IRR_C_GUI_SCROLL_BAR_H_INCLUDED
+#define IRR_C_GUI_SCROLL_BAR_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -110,4 +110,3 @@ namespace gui
 #endif // _IRR_COMPILE_WITH_GUI_
 
 #endif
-

source/Irrlicht/CGUISkin.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_SKIN_H_INCLUDED__
-#define __C_GUI_SKIN_H_INCLUDED__
+#ifndef IRR_C_GUI_SKIN_H_INCLUDED
+#define IRR_C_GUI_SKIN_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -243,5 +243,3 @@ namespace gui
 #endif // _IRR_COMPILE_WITH_GUI_
 
 #endif
-
-

source/Irrlicht/CGUISpinBox.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_SPIN_BOX_H_INCLUDED__
-#define __C_GUI_SPIN_BOX_H_INCLUDED__
+#ifndef IRR_C_GUI_SPIN_BOX_H_INCLUDED
+#define IRR_C_GUI_SPIN_BOX_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -112,5 +112,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_SPIN_BOX_H_INCLUDED__
-
+#endif // IRR_C_GUI_SPIN_BOX_H_INCLUDED

source/Irrlicht/CGUISpriteBank.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_SPRITE_BANK_H_INCLUDED__
-#define __C_GUI_SPRITE_BANK_H_INCLUDED__
+#ifndef IRR_C_GUI_SPRITE_BANK_H_INCLUDED
+#define IRR_C_GUI_SPRITE_BANK_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -101,5 +101,4 @@ protected:
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_SPRITE_BANK_H_INCLUDED__
-
+#endif // IRR_C_GUI_SPRITE_BANK_H_INCLUDED

source/Irrlicht/CGUIStaticText.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_STATIC_TEXT_H_INCLUDED__
-#define __C_GUI_STATIC_TEXT_H_INCLUDED__
+#ifndef IRR_C_GUI_STATIC_TEXT_H_INCLUDED
+#define IRR_C_GUI_STATIC_TEXT_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -145,4 +145,3 @@ namespace gui
 #endif // _IRR_COMPILE_WITH_GUI_
 
 #endif
-

source/Irrlicht/CGUITabControl.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_TAB_CONTROL_H_INCLUDED__
-#define __C_GUI_TAB_CONTROL_H_INCLUDED__
+#ifndef IRR_C_GUI_TAB_CONTROL_H_INCLUDED
+#define IRR_C_GUI_TAB_CONTROL_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -195,4 +195,3 @@ namespace gui
 #endif // _IRR_COMPILE_WITH_GUI_
 
 #endif
-

source/Irrlicht/CGUITable.h

@@ -5,8 +5,8 @@
 // 07.10.2005 - Multicolor-Listbox addet by A. Buschhueter (Acki)
 //                                          A_Buschhueter@gmx.de
 
-#ifndef __C_GUI_TABLE_BAR_H_INCLUDED__
-#define __C_GUI_TABLE_BAR_H_INCLUDED__
+#ifndef IRR_C_GUI_TABLE_BAR_H_INCLUDED
+#define IRR_C_GUI_TABLE_BAR_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -251,4 +251,3 @@ namespace gui
 #endif // _IRR_COMPILE_WITH_GUI_
 
 #endif
-

source/Irrlicht/CGUIToolBar.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_TOOL_BAR_H_INCLUDED__
-#define __C_GUI_TOOL_BAR_H_INCLUDED__
+#ifndef IRR_C_GUI_TOOL_BAR_H_INCLUDED
+#define IRR_C_GUI_TOOL_BAR_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -49,4 +49,3 @@ namespace gui
 #endif // _IRR_COMPILE_WITH_GUI_
 
 #endif
-

source/Irrlicht/CGUITreeView.h

@@ -1,8 +1,8 @@
 // This file is part of the "Irrlicht Engine".
 // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
 
-#ifndef __C_GUI_TREE_VIEW_H_INCLUDED__
-#define __C_GUI_TREE_VIEW_H_INCLUDED__
+#ifndef IRR_C_GUI_TREE_VIEW_H_INCLUDED
+#define IRR_C_GUI_TREE_VIEW_H_INCLUDED
 
 #include "IGUITreeView.h"
 #include "irrList.h"
@@ -352,4 +352,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CGUIWindow.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_WINDOW_H_INCLUDED__
-#define __C_GUI_WINDOW_H_INCLUDED__
+#ifndef IRR_C_GUI_WINDOW_H_INCLUDED
+#define IRR_C_GUI_WINDOW_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -96,4 +96,3 @@ namespace gui
 #endif // _IRR_COMPILE_WITH_GUI_
 
 #endif
-

source/Irrlicht/CGeometryCreator.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GEOMETRY_CREATOR_H_INCLUDED__
-#define __C_GEOMETRY_CREATOR_H_INCLUDED__
+#ifndef IRR_C_GEOMETRY_CREATOR_H_INCLUDED
+#define IRR_C_GEOMETRY_CREATOR_H_INCLUDED
 
 #include "IGeometryCreator.h"
 #include "SMeshBuffer.h"
@@ -68,4 +68,3 @@ public:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CImage.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IMAGE_H_INCLUDED__
-#define __C_IMAGE_H_INCLUDED__
+#ifndef IRR_C_IMAGE_H_INCLUDED
+#define IRR_C_IMAGE_H_INCLUDED
 
 #include "IImage.h"
 #include "rect.h"
@@ -65,6 +65,4 @@ private:
 } // end namespace video
 } // end namespace irr
 
-
 #endif
-

source/Irrlicht/CImageLoaderBMP.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IMAGE_LOADER_BMP_H_INCLUDED__
-#define __C_IMAGE_LOADER_BMP_H_INCLUDED__
+#ifndef IRR_C_IMAGE_LOADER_BMP_H_INCLUDED
+#define IRR_C_IMAGE_LOADER_BMP_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -97,4 +97,3 @@ private:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CImageLoaderDDS.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IMAGE_LOADER_DDS_H_INCLUDED__
-#define __C_IMAGE_LOADER_DDS_H_INCLUDED__
+#ifndef IRR_C_IMAGE_LOADER_DDS_H_INCLUDED
+#define IRR_C_IMAGE_LOADER_DDS_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -212,4 +212,3 @@ public:
 
 #endif // compiled with DDS loader
 #endif
-

source/Irrlicht/CImageLoaderJPG.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IMAGE_LOADER_JPG_H_INCLUDED__
-#define __C_IMAGE_LOADER_JPG_H_INCLUDED__
+#ifndef IRR_C_IMAGE_LOADER_JPG_H_INCLUDED
+#define IRR_C_IMAGE_LOADER_JPG_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -110,4 +110,3 @@ private:
 
 #endif
 #endif
-

source/Irrlicht/CImageLoaderPCX.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IMAGE_LOADER_PCX_H_INCLUDED__
-#define __C_IMAGE_LOADER_PCX_H_INCLUDED__
+#ifndef IRR_C_IMAGE_LOADER_PCX_H_INCLUDED
+#define IRR_C_IMAGE_LOADER_PCX_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -79,4 +79,3 @@ public:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CImageLoaderPNG.h

@@ -6,8 +6,8 @@
 // i wanted to be able to read in PNG images with irrlicht :)
 // why?  lossless compression with 8-bit alpha channel!
 
-#ifndef __C_IMAGE_LOADER_PNG_H_INCLUDED__
-#define __C_IMAGE_LOADER_PNG_H_INCLUDED__
+#ifndef IRR_C_IMAGE_LOADER_PNG_H_INCLUDED
+#define IRR_C_IMAGE_LOADER_PNG_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -42,4 +42,3 @@ public:
 
 #endif
 #endif
-

source/Irrlicht/CImageLoaderPPM.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IMAGE_LOADER_PPM_H_INCLUDED__
-#define __C_IMAGE_LOADER_PPM_H_INCLUDED__
+#ifndef IRR_C_IMAGE_LOADER_PPM_H_INCLUDED
+#define IRR_C_IMAGE_LOADER_PPM_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -49,7 +49,5 @@ private:
 } // end namespace video
 } // end namespace irr
 
-
 #endif
 #endif
-

source/Irrlicht/CImageLoaderPSD.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IMAGE_LOADER_PSD_H_INCLUDED__
-#define __C_IMAGE_LOADER_PSD_H_INCLUDED__
+#ifndef IRR_C_IMAGE_LOADER_PSD_H_INCLUDED
+#define IRR_C_IMAGE_LOADER_PSD_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -69,4 +69,3 @@ private:
 
 #endif
 #endif
-

source/Irrlicht/CImageLoaderPVR.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IMAGE_LOADER_PVR_H_INCLUDED__
-#define __C_IMAGE_LOADER_PVR_H_INCLUDED__
+#ifndef IRR_C_IMAGE_LOADER_PVR_H_INCLUDED
+#define IRR_C_IMAGE_LOADER_PVR_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 

source/Irrlicht/CImageLoaderRGB.h

@@ -13,8 +13,8 @@
 	Updated:
 */
 
-#ifndef __C_IMAGE_LOADER_RGB_H_INCLUDED__
-#define __C_IMAGE_LOADER_RGB_H_INCLUDED__
+#ifndef IRR_C_IMAGE_LOADER_RGB_H_INCLUDED
+#define IRR_C_IMAGE_LOADER_RGB_H_INCLUDED
 
 // define _IRR_RGB_FILE_INVERTED_IMAGE_ to preserve the inverted format of the RGB file
 // commenting this out will invert the inverted image,resulting in the image being upright
@@ -160,5 +160,4 @@ private:
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_RGB_LOADER_
-#endif // __C_IMAGE_LOADER_RGB_H_INCLUDED__
-
+#endif // IRR_C_IMAGE_LOADER_RGB_H_INCLUDED

source/Irrlicht/CImageLoaderTGA.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IMAGE_LOADER_TGA_H_INCLUDED__
-#define __C_IMAGE_LOADER_TGA_H_INCLUDED__
+#ifndef IRR_C_IMAGE_LOADER_TGA_H_INCLUDED
+#define IRR_C_IMAGE_LOADER_TGA_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -79,4 +79,3 @@ private:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CImageLoaderWAL.h

@@ -8,8 +8,8 @@
  Nikolaus Gebhardt for the Irrlicht 3D engine
 */
 
-#ifndef __C_IMAGE_LOADER_WAL_H_INCLUDED__
-#define __C_IMAGE_LOADER_WAL_H_INCLUDED__
+#ifndef IRR_C_IMAGE_LOADER_WAL_H_INCLUDED
+#define IRR_C_IMAGE_LOADER_WAL_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #include "IImageLoader.h"
@@ -97,4 +97,3 @@ public:
 }
 
 #endif
-

source/Irrlicht/CIrrDeviceConsole.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IRR_DEVICE_CONSOLE_H_INCLUDED__
-#define __C_IRR_DEVICE_CONSOLE_H_INCLUDED__
+#ifndef IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED
+#define IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_
@@ -332,5 +332,4 @@ namespace gui
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_CONSOLE_DEVICE_
-#endif // __C_IRR_DEVICE_CONSOLE_H_INCLUDED__
-
+#endif // IRR_C_IRR_DEVICE_CONSOLE_H_INCLUDED

source/Irrlicht/CIrrDeviceFB.h

@@ -3,8 +3,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IRR_DEVICE_FB_H_INCLUDED__
-#define __C_IRR_DEVICE_FB_H_INCLUDED__
+#ifndef IRR_C_IRR_DEVICE_FB_H_INCLUDED
+#define IRR_C_IRR_DEVICE_FB_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -211,5 +211,4 @@ namespace irr
 } // end namespace irr
 
 #endif // _IRR_USE_FB_DEVICE_
-#endif // __C_IRR_DEVICE_FB_H_INCLUDED__
-
+#endif // IRR_C_IRR_DEVICE_FB_H_INCLUDED

source/Irrlicht/CIrrDeviceLinux.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IRR_DEVICE_LINUX_H_INCLUDED__
-#define __C_IRR_DEVICE_LINUX_H_INCLUDED__
+#ifndef IRR_C_IRR_DEVICE_LINUX_H_INCLUDED
+#define IRR_C_IRR_DEVICE_LINUX_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -498,5 +498,4 @@ namespace irr
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_X11_DEVICE_
-#endif // __C_IRR_DEVICE_LINUX_H_INCLUDED__
-
+#endif // IRR_C_IRR_DEVICE_LINUX_H_INCLUDED

source/Irrlicht/CIrrDeviceSDL.h

@@ -4,8 +4,8 @@
 // This device code is based on the original SDL device implementation
 // contributed by Shane Parker (sirshane).
 
-#ifndef __C_IRR_DEVICE_SDL_H_INCLUDED__
-#define __C_IRR_DEVICE_SDL_H_INCLUDED__
+#ifndef IRR_C_IRR_DEVICE_SDL_H_INCLUDED
+#define IRR_C_IRR_DEVICE_SDL_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -235,5 +235,4 @@ namespace irr
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_SDL_DEVICE_
-#endif // __C_IRR_DEVICE_SDL_H_INCLUDED__
-
+#endif // IRR_C_IRR_DEVICE_SDL_H_INCLUDED

source/Irrlicht/CIrrDeviceStub.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IRR_DEVICE_STUB_H_INCLUDED__
-#define __C_IRR_DEVICE_STUB_H_INCLUDED__
+#ifndef IRR_C_IRR_DEVICE_STUB_H_INCLUDED
+#define IRR_C_IRR_DEVICE_STUB_H_INCLUDED
 
 #include "IrrlichtDevice.h"
 #include "IImagePresenter.h"
@@ -192,4 +192,3 @@ namespace irr
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CIrrDeviceWin32.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IRR_DEVICE_WIN32_H_INCLUDED__
-#define __C_IRR_DEVICE_WIN32_H_INCLUDED__
+#ifndef IRR_C_IRR_DEVICE_WIN32_H_INCLUDED
+#define IRR_C_IRR_DEVICE_WIN32_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
@@ -444,4 +444,4 @@ namespace irr
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_WINDOWS_DEVICE_
-#endif // __C_IRR_DEVICE_WIN32_H_INCLUDED__
+#endif // IRR_C_IRR_DEVICE_WIN32_H_INCLUDED

source/Irrlicht/CIrrMeshFileLoader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IRR_MESH_FILE_LOADER_H_INCLUDED__
-#define __C_IRR_MESH_FILE_LOADER_H_INCLUDED__
+#ifndef IRR_C_IRR_MESH_FILE_LOADER_H_INCLUDED
+#define IRR_C_IRR_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 #include "IFileSystem.h"
@@ -87,4 +87,3 @@ private:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CLMTSMeshFileLoader.h

@@ -18,8 +18,8 @@ Version 1.5 - 15 March 2005
 
 */
 
-#if !defined(__C_LMTS_MESH_FILE_LOADER_H_INCLUDED__)
-#define __C_LMTS_MESH_FILE_LOADER_H_INCLUDED__
+#ifndef IRR_C_LMTS_MESH_FILE_LOADER_H_INCLUDED
+#define IRR_C_LMTS_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 #include "SMesh.h"
@@ -106,4 +106,4 @@ private:
 } // end namespace scene
 } // end namespace irr
 
-#endif // !defined(__C_LMTS_MESH_FILE_LOADER_H_INCLUDED__)
+#endif // IRR_C_LMTS_MESH_FILE_LOADER_H_INCLUDED

source/Irrlicht/CLWOMeshFileLoader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_LWO_MESH_FILE_LOADER_H_INCLUDED__
-#define __C_LWO_MESH_FILE_LOADER_H_INCLUDED__
+#ifndef IRR_C_LWO_MESH_FILE_LOADER_H_INCLUDED
+#define IRR_C_LWO_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 #include "SMeshBuffer.h"

source/Irrlicht/CLightSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_LIGHT_SCENE_NODE_H_INCLUDED__
-#define __C_LIGHT_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_C_LIGHT_SCENE_NODE_H_INCLUDED
+#define IRR_C_LIGHT_SCENE_NODE_H_INCLUDED
 
 #include "ILightSceneNode.h"
 
@@ -106,4 +106,3 @@ private:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CLimitReadFile.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_LIMIT_READ_FILE_H_INCLUDED__
-#define __C_LIMIT_READ_FILE_H_INCLUDED__
+#ifndef IRR_C_LIMIT_READ_FILE_H_INCLUDED
+#define IRR_C_LIMIT_READ_FILE_H_INCLUDED
 
 #include "IReadFile.h"
 #include "irrString.h"
@@ -65,4 +65,3 @@ namespace io
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CLogger.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_LOGGER_H_INCLUDED__
-#define __C_LOGGER_H_INCLUDED__
+#ifndef IRR_C_LOGGER_H_INCLUDED
+#define IRR_C_LOGGER_H_INCLUDED
 
 #include "ILogger.h"
 #include "os.h"
@@ -53,4 +53,3 @@ private:
 } // end namespace
 
 #endif
-

source/Irrlicht/CMD2MeshFileLoader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_MD2_MESH_FILE_LOADER_H_INCLUDED__
-#define __C_MD2_MESH_FILE_LOADER_H_INCLUDED__
+#ifndef IRR_C_MD2_MESH_FILE_LOADER_H_INCLUDED
+#define IRR_C_MD2_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 
@@ -41,5 +41,4 @@ private:
 } // end namespace scene
 } // end namespace irr
 
-#endif // __C_MD2_MESH_LOADER_H_INCLUDED__
-
+#endif // IRR_C_MD2_MESH_LOADER_H_INCLUDED

source/Irrlicht/CMD3MeshFileLoader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_MD3_MESH_FILE_LOADER_H_INCLUDED__
-#define __C_MD3_MESH_FILE_LOADER_H_INCLUDED__
+#ifndef IRR_C_MD3_MESH_FILE_LOADER_H_INCLUDED
+#define IRR_C_MD3_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 #include "IFileSystem.h"
@@ -46,4 +46,3 @@ private:
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CMS3DMeshFileLoader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_MS3D_MESH_FILE_LOADER_H_INCLUDED__
-#define __C_MS3D_MESH_FILE_LOADER_H_INCLUDED__
+#ifndef IRR_C_MS3D_MESH_FILE_LOADER_H_INCLUDED
+#define IRR_C_MS3D_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 #include "IVideoDriver.h"
@@ -45,5 +45,3 @@ private:
 } // end namespace irr
 
 #endif
-
-

source/Irrlicht/CMY3DHelper.h

@@ -15,8 +15,8 @@
 //                      some useful functions
 //**********************************************************************
 
-#ifndef __C_MY3D_HELPER_H_INCLUDED__
-#define __C_MY3D_HELPER_H_INCLUDED__
+#ifndef IRR_C_MY3D_HELPER_H_INCLUDED
+#define IRR_C_MY3D_HELPER_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -441,5 +441,4 @@ int rle_decode (
 } //end namespace irr
 
 
-#endif // __C_MY3D_HELPER_H_INCLUDED__
-
+#endif // IRR_C_MY3D_HELPER_H_INCLUDED

source/Irrlicht/CMemoryFile.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_MEMORY_READ_FILE_H_INCLUDED__
-#define __C_MEMORY_READ_FILE_H_INCLUDED__
+#ifndef IRR_C_MEMORY_READ_FILE_H_INCLUDED
+#define IRR_C_MEMORY_READ_FILE_H_INCLUDED
 
 #include "IMemoryReadFile.h"
 #include "IWriteFile.h"
@@ -104,4 +104,3 @@ namespace io
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CMeshCache.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_MESH_CACHE_H_INCLUDED__
-#define __C_MESH_CACHE_H_INCLUDED__
+#ifndef IRR_C_MESH_CACHE_H_INCLUDED
+#define IRR_C_MESH_CACHE_H_INCLUDED
 
 #include "IMeshCache.h"
 #include "irrArray.h"
@@ -120,4 +120,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CMeshManipulator.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_MESH_MANIPULATOR_H_INCLUDED__
-#define __C_MESH_MANIPULATOR_H_INCLUDED__
+#ifndef IRR_C_MESH_MANIPULATOR_H_INCLUDED
+#define IRR_C_MESH_MANIPULATOR_H_INCLUDED
 
 #include "IMeshManipulator.h"
 
@@ -97,5 +97,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif

source/Irrlicht/CMeshSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_MESH_SCENE_NODE_H_INCLUDED__
-#define __C_MESH_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_C_MESH_SCENE_NODE_H_INCLUDED
+#define IRR_C_MESH_SCENE_NODE_H_INCLUDED
 
 #include "IMeshSceneNode.h"
 #include "IMesh.h"
@@ -100,4 +100,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CMetaTriangleSelector.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_META_TRIANGLE_SELECTOR_H_INCLUDED__
-#define __C_META_TRIANGLE_SELECTOR_H_INCLUDED__
+#ifndef IRR_C_META_TRIANGLE_SELECTOR_H_INCLUDED
+#define IRR_C_META_TRIANGLE_SELECTOR_H_INCLUDED
 
 #include "IMetaTriangleSelector.h"
 #include "irrArray.h"
@@ -76,4 +76,3 @@ private:
 
 
 #endif
-

source/Irrlicht/CMountPointReader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_MOUNT_READER_H_INCLUDED__
-#define __C_MOUNT_READER_H_INCLUDED__
+#ifndef IRR_C_MOUNT_READER_H_INCLUDED
+#define IRR_C_MOUNT_READER_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -89,4 +89,4 @@ namespace io
 } // irr
 
 #endif // __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
-#endif // __C_MOUNT_READER_H_INCLUDED__
+#endif // IRR_C_MOUNT_READER_H_INCLUDED

source/Irrlicht/CNPKReader.h

@@ -3,8 +3,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_NPK_READER_H_INCLUDED__
-#define __C_NPK_READER_H_INCLUDED__
+#ifndef IRR_C_NPK_READER_H_INCLUDED
+#define IRR_C_NPK_READER_H_INCLUDED
 
 #include "IrrCompileConfig.h"
 
@@ -121,5 +121,4 @@ namespace io
 
 #endif // __IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_
 
-#endif // __C_NPK_READER_H_INCLUDED__
-
+#endif // IRR_C_NPK_READER_H_INCLUDED

source/Irrlicht/CNullDriver.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_VIDEO_NULL_H_INCLUDED__
-#define __C_VIDEO_NULL_H_INCLUDED__
+#ifndef IRR_C_VIDEO_NULL_H_INCLUDED
+#define IRR_C_VIDEO_NULL_H_INCLUDED
 
 #include "IVideoDriver.h"
 #include "IFileSystem.h"
@@ -900,5 +900,4 @@ namespace video
 } // end namespace video
 } // end namespace irr
 
-
 #endif

source/Irrlicht/COBJMeshFileLoader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OBJ_MESH_FILE_LOADER_H_INCLUDED__
-#define __C_OBJ_MESH_FILE_LOADER_H_INCLUDED__
+#ifndef IRR_C_OBJ_MESH_FILE_LOADER_H_INCLUDED
+#define IRR_C_OBJ_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
 #include "IFileSystem.h"
@@ -119,4 +119,3 @@ private:
 } // end namespace irr
 
 #endif
-