diff --git a/source/Irrlicht/Android/CAndroidAssetFileArchive.h b/source/Irrlicht/Android/CAndroidAssetFileArchive.h
index 24a62f05..d8610ed1 100644
--- a/source/Irrlicht/Android/CAndroidAssetFileArchive.h
+++ b/source/Irrlicht/Android/CAndroidAssetFileArchive.h
@@ -2,10 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_ANDROID_ASSET_FILE_ARCHIVE_H_INCLUDED__
-#define __C_ANDROID_ASSET_FILE_ARCHIVE_H_INCLUDED__
-
-
+#pragma once
 
 #ifdef  _IRR_COMPILE_ANDROID_ASSET_READER_
 
@@ -47,7 +44,7 @@ namespace io
 		//! get the archive type
 		virtual E_FILE_ARCHIVE_TYPE getType() const;
 
-		//! Add a directory to read files from. Since the Android 
+		//! Add a directory to read files from. Since the Android
 		//! API does not return names of directories, they need to
 		//! be added manually.
 		virtual void addDirectoryToFileList(const io::path &filename);
@@ -65,5 +62,3 @@ namespace io
 } // end namespace irr
 
 #endif //   _IRR_COMPILE_ANDROID_ASSET_READER_
-#endif //  __C_ANDROID_ASSET_READER_H_INCLUDED__
-
diff --git a/source/Irrlicht/Android/CAndroidAssetReader.h b/source/Irrlicht/Android/CAndroidAssetReader.h
index 7791a771..9e4e7732 100644
--- a/source/Irrlicht/Android/CAndroidAssetReader.h
+++ b/source/Irrlicht/Android/CAndroidAssetReader.h
@@ -2,10 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_ANDROID_ASSET_READER_H_INCLUDED__
-#define __C_ANDROID_ASSET_READER_H_INCLUDED__
-
-
+#pragma once
 
 #ifdef  _IRR_COMPILE_ANDROID_ASSET_READER_
 
@@ -70,5 +67,3 @@ namespace io
 } // end namespace irr
 
 #endif //   _IRR_COMPILE_ANDROID_ASSET_READER_
-#endif //  __C_ANDROID_ASSET_READER_H_INCLUDED__
-
diff --git a/source/Irrlicht/Android/CIrrDeviceAndroid.h b/source/Irrlicht/Android/CIrrDeviceAndroid.h
index 4a3cd953..da786cca 100644
--- a/source/Irrlicht/Android/CIrrDeviceAndroid.h
+++ b/source/Irrlicht/Android/CIrrDeviceAndroid.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IRR_DEVICE_ANDROID_H_INCLUDED__
-#define __C_IRR_DEVICE_ANDROID_H_INCLUDED__
+#pragma once
 
 
 #ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
@@ -100,4 +99,3 @@ namespace irr
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_
-#endif // __C_IRR_DEVICE_ANDROID_H_INCLUDED__
diff --git a/source/Irrlicht/Android/CKeyEventWrapper.h b/source/Irrlicht/Android/CKeyEventWrapper.h
index b6bc09bf..81001ed2 100644
--- a/source/Irrlicht/Android/CKeyEventWrapper.h
+++ b/source/Irrlicht/Android/CKeyEventWrapper.h
@@ -1,9 +1,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__
-#define __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
 
@@ -28,7 +26,7 @@ public:
 	int getUnicodeChar(int metaState);
 
 private:
-	static jclass Class_KeyEvent; 
+	static jclass Class_KeyEvent;
 	static jmethodID Method_getUnicodeChar;
 	static jmethodID Method_constructor;
 	JNIEnv* JniEnv;
@@ -39,4 +37,3 @@ private:
 } // namespace irr
 
 #endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_
-#endif // __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__
diff --git a/source/Irrlicht/BuiltInFont.h b/source/Irrlicht/BuiltInFont.h
index 5d88937d..3e32c875 100644
--- a/source/Irrlicht/BuiltInFont.h
+++ b/source/Irrlicht/BuiltInFont.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __BUILD_IN_FONT_H_INCLUDED__
-#define __BUILD_IN_FONT_H_INCLUDED__
-
+#pragma once
 
 // header file generated by Bin2H, copyright 2002 by N.Gebhardt.
 // Bin2H is Freeware. Download it freely from www.code3d.com.
@@ -1055,5 +1053,3 @@ const u8 BuiltInFontData[] =
 	const u32 BuiltInFontDataSize = sizeof(BuiltInFontData);
 } // end namespace gui
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/CAnimatedMeshSceneNode.h b/source/Irrlicht/CAnimatedMeshSceneNode.h
index a11a1909..a45f775f 100644
--- a/source/Irrlicht/CAnimatedMeshSceneNode.h
+++ b/source/Irrlicht/CAnimatedMeshSceneNode.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IAnimatedMeshSceneNode.h"
 #include "IAnimatedMesh.h"
@@ -180,6 +179,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/CAttributes.h b/source/Irrlicht/CAttributes.h
index 3d881156..1bfdfc57 100644
--- a/source/Irrlicht/CAttributes.h
+++ b/source/Irrlicht/CAttributes.h
@@ -2,9 +2,7 @@
 // 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__
-
+#pragma once
 
 #include "IAttributes.h"
 #include "IAttribute.h"
@@ -148,5 +146,3 @@ protected:
 } // end namespace io
 } // end namespace irr
 
-#endif
-
diff --git a/source/Irrlicht/CB3DMeshFileLoader.h b/source/Irrlicht/CB3DMeshFileLoader.h
index d19f190e..82fd69bd 100644
--- a/source/Irrlicht/CB3DMeshFileLoader.h
+++ b/source/Irrlicht/CB3DMeshFileLoader.h
@@ -7,8 +7,7 @@
 // declared public domain
 
 
-#ifndef __C_B3D_MESH_LOADER_H_INCLUDED__
-#define __C_B3D_MESH_LOADER_H_INCLUDED__
+#pragma once
 
 #include "IMeshLoader.h"
 #include "ISceneManager.h"
@@ -82,6 +81,3 @@ private:
 
 } // end namespace scene
 } // end namespace irr
-
-#endif // __C_B3D_MESH_LOADER_H_INCLUDED__
-
diff --git a/source/Irrlicht/CB3DMeshWriter.h b/source/Irrlicht/CB3DMeshWriter.h
index 86a35d93..25737d2b 100644
--- a/source/Irrlicht/CB3DMeshWriter.h
+++ b/source/Irrlicht/CB3DMeshWriter.h
@@ -4,8 +4,7 @@
 
 // Modified version with rigging/skinning support
 
-#ifndef __IRR_B3D_MESH_WRITER_H_INCLUDED__
-#define __IRR_B3D_MESH_WRITER_H_INCLUDED__
+#pragma once
 
 #include "IMeshWriter.h"
 #include "IWriteFile.h"
@@ -50,4 +49,3 @@ private:
 } // end namespace
 } // end namespace
 
-#endif
diff --git a/source/Irrlicht/CBillboardSceneNode.h b/source/Irrlicht/CBillboardSceneNode.h
index 6f13a27f..92b4f828 100644
--- a/source/Irrlicht/CBillboardSceneNode.h
+++ b/source/Irrlicht/CBillboardSceneNode.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IBillboardSceneNode.h"
 #include "SMeshBuffer.h"
@@ -116,5 +115,3 @@ private:
 } // end namespace scene
 } // end namespace irr
 
-#endif
-
diff --git a/source/Irrlicht/CBlit.h b/source/Irrlicht/CBlit.h
index d20ca416..1990bb3b 100644
--- a/source/Irrlicht/CBlit.h
+++ b/source/Irrlicht/CBlit.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef _C_BLIT_H_INCLUDED_
-#define _C_BLIT_H_INCLUDED_
+#pragma once
 
 #include "SoftwareDriver2_helper.h"
 
@@ -1058,6 +1057,3 @@ static s32 Blit(eBlitter operation,
 }
 
 }
-
-#endif
-
diff --git a/source/Irrlicht/CBoneSceneNode.h b/source/Irrlicht/CBoneSceneNode.h
index c23f3381..c054c88f 100644
--- a/source/Irrlicht/CBoneSceneNode.h
+++ b/source/Irrlicht/CBoneSceneNode.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 // Used with SkinnedMesh and IAnimatedMeshSceneNode, for boned meshes
 
@@ -69,5 +68,3 @@ namespace scene
 } // end namespace scene
 } // end namespace irr
 
-#endif
-
diff --git a/source/Irrlicht/CCameraSceneNode.h b/source/Irrlicht/CCameraSceneNode.h
index d128d5c1..80379f23 100644
--- a/source/Irrlicht/CCameraSceneNode.h
+++ b/source/Irrlicht/CCameraSceneNode.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "ICameraSceneNode.h"
 #include "SViewFrustum.h"
@@ -168,6 +167,3 @@ namespace scene
 
 } // end namespace
 } // end namespace
-
-#endif
-
diff --git a/source/Irrlicht/CColorConverter.h b/source/Irrlicht/CColorConverter.h
index 7a8f4a38..364a9f1c 100644
--- a/source/Irrlicht/CColorConverter.h
+++ b/source/Irrlicht/CColorConverter.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "irrTypes.h"
 #include "IImage.h"
@@ -97,5 +96,3 @@ public:
 } // end namespace video
 } // end namespace irr
 
-#endif
-
diff --git a/source/Irrlicht/CDummyTransformationSceneNode.h b/source/Irrlicht/CDummyTransformationSceneNode.h
index b9f610b1..f79d44f8 100644
--- a/source/Irrlicht/CDummyTransformationSceneNode.h
+++ b/source/Irrlicht/CDummyTransformationSceneNode.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IDummyTransformationSceneNode.h"
 
@@ -58,5 +57,3 @@ namespace scene
 } // end namespace scene
 } // end namespace irr
 
-#endif
-
diff --git a/source/Irrlicht/CEGLManager.h b/source/Irrlicht/CEGLManager.h
index 78e96c88..aa659b79 100755
--- a/source/Irrlicht/CEGLManager.h
+++ b/source/Irrlicht/CEGLManager.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_EGL_MANAGER_H_INCLUDED__
-#define __C_EGL_MANAGER_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_EGL_MANAGER_
 
@@ -114,4 +112,3 @@ namespace video
 }
 }
 #endif
-#endif
diff --git a/source/Irrlicht/CEmptySceneNode.h b/source/Irrlicht/CEmptySceneNode.h
index 8a35115c..e2080fc4 100644
--- a/source/Irrlicht/CEmptySceneNode.h
+++ b/source/Irrlicht/CEmptySceneNode.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "ISceneNode.h"
 
@@ -41,6 +40,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/CFPSCounter.h b/source/Irrlicht/CFPSCounter.h
index 12e0d4e8..67b293c4 100644
--- a/source/Irrlicht/CFPSCounter.h
+++ b/source/Irrlicht/CFPSCounter.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "irrTypes.h"
 
@@ -48,7 +47,3 @@ private:
 
 } // end namespace video
 } // end namespace irr
-
-
-#endif
-
diff --git a/source/Irrlicht/CFileList.h b/source/Irrlicht/CFileList.h
index dd92d982..449894ee 100644
--- a/source/Irrlicht/CFileList.h
+++ b/source/Irrlicht/CFileList.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IFileList.h"
 #include "irrString.h"
@@ -132,7 +131,3 @@ protected:
 
 } // end namespace irr
 } // end namespace io
-
-
-#endif
-
diff --git a/source/Irrlicht/CFileSystem.h b/source/Irrlicht/CFileSystem.h
index bc04fd82..bb87d375 100644
--- a/source/Irrlicht/CFileSystem.h
+++ b/source/Irrlicht/CFileSystem.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IFileSystem.h"
 #include "irrArray.h"
@@ -140,6 +139,3 @@ private:
 
 } // end namespace irr
 } // end namespace io
-
-#endif
-
diff --git a/source/Irrlicht/CGLXManager.h b/source/Irrlicht/CGLXManager.h
index 9e4ce74e..7099d42d 100644
--- a/source/Irrlicht/CGLXManager.h
+++ b/source/Irrlicht/CGLXManager.h
@@ -2,9 +2,7 @@
 // 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__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_GLX_MANAGER_
 
@@ -76,6 +74,3 @@ namespace video
 }
 
 #endif
-
-#endif
-
diff --git a/source/Irrlicht/CGUIButton.h b/source/Irrlicht/CGUIButton.h
index 0e429573..784b6e5f 100644
--- a/source/Irrlicht/CGUIButton.h
+++ b/source/Irrlicht/CGUIButton.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUIButton.h"
 #include "IGUISpriteBank.h"
@@ -240,5 +239,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif // __C_GUI_BUTTON_H_INCLUDED__
diff --git a/source/Irrlicht/CGUICheckBox.h b/source/Irrlicht/CGUICheckBox.h
index 8319243e..876ec69c 100644
--- a/source/Irrlicht/CGUICheckBox.h
+++ b/source/Irrlicht/CGUICheckBox.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUICheckBox.h"
 
@@ -56,5 +55,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif // __C_GUI_CHECKBOX_H_INCLUDED__
diff --git a/source/Irrlicht/CGUIComboBox.h b/source/Irrlicht/CGUIComboBox.h
index 2dab66f1..be766481 100644
--- a/source/Irrlicht/CGUIComboBox.h
+++ b/source/Irrlicht/CGUIComboBox.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUIComboBox.h"
 #include "IGUIStaticText.h"
@@ -103,5 +102,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif // __C_GUI_COMBO_BOX_H_INCLUDED__
diff --git a/source/Irrlicht/CGUIEditBox.h b/source/Irrlicht/CGUIEditBox.h
index 4a1b6e8f..f3e7baf5 100644
--- a/source/Irrlicht/CGUIEditBox.h
+++ b/source/Irrlicht/CGUIEditBox.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUIEditBox.h"
 #include "irrArray.h"
@@ -197,5 +196,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif // __C_GUI_EDIT_BOX_H_INCLUDED__
diff --git a/source/Irrlicht/CGUIEnvironment.h b/source/Irrlicht/CGUIEnvironment.h
index f68b0daf..a6dd83ea 100644
--- a/source/Irrlicht/CGUIEnvironment.h
+++ b/source/Irrlicht/CGUIEnvironment.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUIEnvironment.h"
 #include "IGUIElement.h"
@@ -227,5 +226,3 @@ private:
 
 } // end namespace gui
 } // end namespace irr
-
-#endif // __C_GUI_ENVIRONMENT_H_INCLUDED__
diff --git a/source/Irrlicht/CGUIFileOpenDialog.h b/source/Irrlicht/CGUIFileOpenDialog.h
index a1d633c4..e1de61f0 100644
--- a/source/Irrlicht/CGUIFileOpenDialog.h
+++ b/source/Irrlicht/CGUIFileOpenDialog.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUIFileOpenDialog.h"
 #include "IGUIButton.h"
@@ -86,5 +85,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif // __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
diff --git a/source/Irrlicht/CGUIFont.h b/source/Irrlicht/CGUIFont.h
index 449df086..61b7854f 100644
--- a/source/Irrlicht/CGUIFont.h
+++ b/source/Irrlicht/CGUIFont.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUIFontBitmap.h"
 #include "irrString.h"
@@ -107,5 +106,3 @@ private:
 
 } // end namespace gui
 } // end namespace irr
-
-#endif // __C_GUI_FONT_H_INCLUDED__
diff --git a/source/Irrlicht/CGUIImage.h b/source/Irrlicht/CGUIImage.h
index c8a46f26..eab41a20 100644
--- a/source/Irrlicht/CGUIImage.h
+++ b/source/Irrlicht/CGUIImage.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUIImage.h"
 
@@ -98,5 +97,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif // __C_GUI_IMAGE_H_INCLUDED__
diff --git a/source/Irrlicht/CGUIImageList.h b/source/Irrlicht/CGUIImageList.h
index 128edba2..2f9b1db4 100644
--- a/source/Irrlicht/CGUIImageList.h
+++ b/source/Irrlicht/CGUIImageList.h
@@ -1,8 +1,7 @@
 // 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__
+#pragma once
 
 #include "IGUIImageList.h"
 #include "IVideoDriver.h"
@@ -62,6 +61,3 @@ private:
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/CGUIListBox.h b/source/Irrlicht/CGUIListBox.h
index a3e7255a..7a5d420f 100644
--- a/source/Irrlicht/CGUIListBox.h
+++ b/source/Irrlicht/CGUIListBox.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUIListBox.h"
 #include "irrArray.h"
@@ -174,5 +173,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/CGUIScrollBar.h b/source/Irrlicht/CGUIScrollBar.h
index d1d04b89..58f82565 100644
--- a/source/Irrlicht/CGUIScrollBar.h
+++ b/source/Irrlicht/CGUIScrollBar.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUIScrollBar.h"
 #include "IGUIButton.h"
@@ -97,5 +96,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/CGUISkin.h b/source/Irrlicht/CGUISkin.h
index d6f8ef8f..89aab2fa 100644
--- a/source/Irrlicht/CGUISkin.h
+++ b/source/Irrlicht/CGUISkin.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUISkin.h"
 #include "irrString.h"
@@ -230,5 +229,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/CGUISpriteBank.h b/source/Irrlicht/CGUISpriteBank.h
index 5bd115bc..563f4d1d 100644
--- a/source/Irrlicht/CGUISpriteBank.h
+++ b/source/Irrlicht/CGUISpriteBank.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUISpriteBank.h"
 
@@ -83,5 +82,3 @@ protected:
 
 } // end namespace gui
 } // end namespace irr
-
-#endif // __C_GUI_SPRITE_BANK_H_INCLUDED__
diff --git a/source/Irrlicht/CGUIStaticText.h b/source/Irrlicht/CGUIStaticText.h
index 8e1babe9..d667bba6 100644
--- a/source/Irrlicht/CGUIStaticText.h
+++ b/source/Irrlicht/CGUIStaticText.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUIStaticText.h"
 #include "irrArray.h"
@@ -132,5 +131,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/CGUITabControl.h b/source/Irrlicht/CGUITabControl.h
index 4c2a0549..e4951256 100644
--- a/source/Irrlicht/CGUITabControl.h
+++ b/source/Irrlicht/CGUITabControl.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IGUITabControl.h"
 #include "irrArray.h"
@@ -180,5 +179,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/CImage.h b/source/Irrlicht/CImage.h
index 20dbb4df..642be768 100644
--- a/source/Irrlicht/CImage.h
+++ b/source/Irrlicht/CImage.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IImage.h"
 #include "rect.h"
@@ -74,7 +73,3 @@ private:
 
 } // end namespace video
 } // end namespace irr
-
-
-#endif
-
diff --git a/source/Irrlicht/CImageLoaderBMP.h b/source/Irrlicht/CImageLoaderBMP.h
index 1f944032..dc705eff 100644
--- a/source/Irrlicht/CImageLoaderBMP.h
+++ b/source/Irrlicht/CImageLoaderBMP.h
@@ -2,9 +2,7 @@
 // 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__
-
+#pragma once
 
 #include "IImageLoader.h"
 
@@ -85,5 +83,3 @@ private:
 
 } // end namespace video
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/CImageLoaderJPG.h b/source/Irrlicht/CImageLoaderJPG.h
index 03163941..23351b56 100644
--- a/source/Irrlicht/CImageLoaderJPG.h
+++ b/source/Irrlicht/CImageLoaderJPG.h
@@ -2,9 +2,7 @@
 // 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__
-
+#pragma once
 
 #include "IImageLoader.h"
 
@@ -91,6 +89,3 @@ private:
 
 } // end namespace video
 } // end namespace irr
-
-
-#endif
diff --git a/source/Irrlicht/CImageLoaderPNG.h b/source/Irrlicht/CImageLoaderPNG.h
index 45a37fd3..cc7ae150 100644
--- a/source/Irrlicht/CImageLoaderPNG.h
+++ b/source/Irrlicht/CImageLoaderPNG.h
@@ -6,9 +6,7 @@
 // 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__
-
+#pragma once
 
 #include "IImageLoader.h"
 
@@ -36,5 +34,3 @@ public:
 
 } // end namespace video
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/CImageLoaderTGA.h b/source/Irrlicht/CImageLoaderTGA.h
index 4e675793..3dc82e17 100644
--- a/source/Irrlicht/CImageLoaderTGA.h
+++ b/source/Irrlicht/CImageLoaderTGA.h
@@ -2,9 +2,7 @@
 // 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__
-
+#pragma once
 
 #include "IImageLoader.h"
 
@@ -68,5 +66,3 @@ private:
 
 } // end namespace video
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/CImageWriterJPG.h b/source/Irrlicht/CImageWriterJPG.h
index dd98e913..5e2a2b0c 100644
--- a/source/Irrlicht/CImageWriterJPG.h
+++ b/source/Irrlicht/CImageWriterJPG.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef _C_IMAGE_WRITER_JPG_H_INCLUDED__
-#define _C_IMAGE_WRITER_JPG_H_INCLUDED__
-
+#pragma once
 
 #include "IImageWriter.h"
 
@@ -28,5 +26,3 @@ public:
 
 }
 }
-
-#endif // _C_IMAGE_WRITER_JPG_H_INCLUDED__
diff --git a/source/Irrlicht/CImageWriterPNG.h b/source/Irrlicht/CImageWriterPNG.h
index 181d0c50..9a346e4b 100644
--- a/source/Irrlicht/CImageWriterPNG.h
+++ b/source/Irrlicht/CImageWriterPNG.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef _C_IMAGE_WRITER_PNG_H_INCLUDED__
-#define _C_IMAGE_WRITER_PNG_H_INCLUDED__
-
+#pragma once
 
 #include "IImageWriter.h"
 
@@ -28,5 +26,3 @@ public:
 
 } // namespace video
 } // namespace irr
-
-#endif // _C_IMAGE_WRITER_PNG_H_INCLUDED__
diff --git a/source/Irrlicht/CIrrDeviceLinux.h b/source/Irrlicht/CIrrDeviceLinux.h
index 5ac6eae9..38f69818 100644
--- a/source/Irrlicht/CIrrDeviceLinux.h
+++ b/source/Irrlicht/CIrrDeviceLinux.h
@@ -2,9 +2,7 @@
 // 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__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_X11_DEVICE_
 
@@ -483,5 +481,3 @@ namespace irr
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_X11_DEVICE_
-#endif // __C_IRR_DEVICE_LINUX_H_INCLUDED__
-
diff --git a/source/Irrlicht/CIrrDeviceOSX.h b/source/Irrlicht/CIrrDeviceOSX.h
index d1b2049e..4e26158b 100644
--- a/source/Irrlicht/CIrrDeviceOSX.h
+++ b/source/Irrlicht/CIrrDeviceOSX.h
@@ -3,9 +3,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_IRR_DEVICE_OSX_H_INCLUDED__
-#define __C_IRR_DEVICE_OSX_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
 
@@ -249,5 +247,3 @@ namespace irr
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_OSX_DEVICE_
-#endif // __C_IRR_DEVICE_MACOSX_H_INCLUDED__
-
diff --git a/source/Irrlicht/CIrrDeviceSDL.h b/source/Irrlicht/CIrrDeviceSDL.h
index 35a2a069..778211d6 100644
--- a/source/Irrlicht/CIrrDeviceSDL.h
+++ b/source/Irrlicht/CIrrDeviceSDL.h
@@ -4,9 +4,7 @@
 // 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__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
 
@@ -325,5 +323,3 @@ namespace irr
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_SDL_DEVICE_
-#endif // __C_IRR_DEVICE_SDL_H_INCLUDED__
-
diff --git a/source/Irrlicht/CIrrDeviceStub.h b/source/Irrlicht/CIrrDeviceStub.h
index 3ffa8f38..044150c9 100644
--- a/source/Irrlicht/CIrrDeviceStub.h
+++ b/source/Irrlicht/CIrrDeviceStub.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IrrlichtDevice.h"
 #include "SIrrCreationParameters.h"
@@ -206,6 +205,3 @@ namespace irr
 	};
 
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/CIrrDeviceWin32.h b/source/Irrlicht/CIrrDeviceWin32.h
index 6737e780..7f79c2e6 100644
--- a/source/Irrlicht/CIrrDeviceWin32.h
+++ b/source/Irrlicht/CIrrDeviceWin32.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
 
@@ -428,4 +427,3 @@ namespace irr
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_WINDOWS_DEVICE_
-#endif // __C_IRR_DEVICE_WIN32_H_INCLUDED__
diff --git a/source/Irrlicht/CLimitReadFile.h b/source/Irrlicht/CLimitReadFile.h
index 7a4c8d98..51c180ff 100644
--- a/source/Irrlicht/CLimitReadFile.h
+++ b/source/Irrlicht/CLimitReadFile.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IReadFile.h"
 #include "irrString.h"
@@ -63,6 +62,3 @@ namespace io
 
 } // end namespace io
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/CLogger.h b/source/Irrlicht/CLogger.h
index e697f5c7..be3984ee 100644
--- a/source/Irrlicht/CLogger.h
+++ b/source/Irrlicht/CLogger.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "ILogger.h"
 #include "os.h"
@@ -51,6 +50,3 @@ private:
 };
 
 } // end namespace
-
-#endif
-
diff --git a/source/Irrlicht/CMemoryFile.h b/source/Irrlicht/CMemoryFile.h
index 7afef1fc..b30f9103 100644
--- a/source/Irrlicht/CMemoryFile.h
+++ b/source/Irrlicht/CMemoryFile.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IMemoryReadFile.h"
 #include "IWriteFile.h"
@@ -102,6 +101,3 @@ namespace io
 
 } // end namespace io
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/CMeshCache.h b/source/Irrlicht/CMeshCache.h
index 5ac76a24..b1c51d46 100644
--- a/source/Irrlicht/CMeshCache.h
+++ b/source/Irrlicht/CMeshCache.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IMeshCache.h"
 #include "irrArray.h"
@@ -118,6 +117,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/CMeshManipulator.h b/source/Irrlicht/CMeshManipulator.h
index 3b7455e8..b0d452d6 100644
--- a/source/Irrlicht/CMeshManipulator.h
+++ b/source/Irrlicht/CMeshManipulator.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IMeshManipulator.h"
 
@@ -45,6 +44,3 @@ public:
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif
diff --git a/source/Irrlicht/CMeshSceneNode.h b/source/Irrlicht/CMeshSceneNode.h
index 52174452..520ad503 100644
--- a/source/Irrlicht/CMeshSceneNode.h
+++ b/source/Irrlicht/CMeshSceneNode.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IMeshSceneNode.h"
 #include "IMesh.h"
@@ -86,6 +85,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/CNSOGLManager.h b/source/Irrlicht/CNSOGLManager.h
index 8744d16e..7c64adb9 100644
--- a/source/Irrlicht/CNSOGLManager.h
+++ b/source/Irrlicht/CNSOGLManager.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_NSOGL_MANAGER_H_INCLUDED__
-#define __C_NSOGL_MANAGER_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_NSOGL_MANAGER_
 
@@ -70,5 +68,3 @@ namespace video
 }
 
 #endif
-
-#endif
diff --git a/source/Irrlicht/CNullDriver.h b/source/Irrlicht/CNullDriver.h
index d3d933c6..18c80f06 100644
--- a/source/Irrlicht/CNullDriver.h
+++ b/source/Irrlicht/CNullDriver.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IVideoDriver.h"
 #include "IFileSystem.h"
@@ -662,7 +661,7 @@ namespace video
 
 		//! adds a surface, not loaded or created by the Irrlicht Engine
 		void addTexture(ITexture* surface);
-		
+
 		virtual ITexture* createDeviceDependentTexture(const io::path& name, IImage* image);
 
 		virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array<IImage*>& image);
@@ -838,6 +837,3 @@ namespace video
 
 } // end namespace video
 } // end namespace irr
-
-
-#endif
diff --git a/source/Irrlicht/COBJMeshFileLoader.h b/source/Irrlicht/COBJMeshFileLoader.h
index c706a5d6..fe2d133c 100644
--- a/source/Irrlicht/COBJMeshFileLoader.h
+++ b/source/Irrlicht/COBJMeshFileLoader.h
@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include <map>
 #include "IMeshLoader.h"
@@ -109,6 +108,3 @@ private:
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/COGLES2Common.h b/source/Irrlicht/COGLES2Common.h
index a69f6674..488d371b 100644
--- a/source/Irrlicht/COGLES2Common.h
+++ b/source/Irrlicht/COGLES2Common.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OGLES2_COMMON_H_INCLUDED__
-#define __C_OGLES2_COMMON_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OGLES2_
 
@@ -72,4 +70,3 @@ namespace video
 }
 
 #endif
-#endif
diff --git a/source/Irrlicht/COGLES2Driver.h b/source/Irrlicht/COGLES2Driver.h
index eaf4d99f..ece2391f 100644
--- a/source/Irrlicht/COGLES2Driver.h
+++ b/source/Irrlicht/COGLES2Driver.h
@@ -3,9 +3,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_OGLES2_DRIVER_H_INCLUDED__
-#define __C_OGLES2_DRIVER_H_INCLUDED__
-
+#pragma once
 
 #include "SIrrCreationParameters.h"
 
@@ -405,5 +403,3 @@ private:
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_OGLES2_
-
-#endif // __C_OGLES2_DRIVER_H_INCLUDED__
diff --git a/source/Irrlicht/COGLES2ExtensionHandler.h b/source/Irrlicht/COGLES2ExtensionHandler.h
index 73db08a8..d7bf3290 100644
--- a/source/Irrlicht/COGLES2ExtensionHandler.h
+++ b/source/Irrlicht/COGLES2ExtensionHandler.h
@@ -3,9 +3,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_OGLES2_EXTENSION_HANDLER_H_INCLUDED__
-#define __C_OGLES2_EXTENSION_HANDLER_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OGLES2_
 
@@ -190,4 +188,3 @@ namespace video
 }
 
 #endif
-#endif
diff --git a/source/Irrlicht/COGLES2FixedPipelineRenderer.h b/source/Irrlicht/COGLES2FixedPipelineRenderer.h
index a60507c5..8f829d44 100644
--- a/source/Irrlicht/COGLES2FixedPipelineRenderer.h
+++ b/source/Irrlicht/COGLES2FixedPipelineRenderer.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_OGLES2_FIXED_PIPELINE_SHADER_H_INCLUDED__
-#define __C_OGLES2_FIXED_PIPELINE_SHADER_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OGLES2_
 
@@ -111,5 +109,3 @@ protected:
 }
 
 #endif
-#endif
-
diff --git a/source/Irrlicht/COGLES2MaterialRenderer.h b/source/Irrlicht/COGLES2MaterialRenderer.h
index c77c2127..8ac140ba 100644
--- a/source/Irrlicht/COGLES2MaterialRenderer.h
+++ b/source/Irrlicht/COGLES2MaterialRenderer.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OGLES2_SL_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_OGLES2_SL_MATERIAL_RENDERER_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OGLES2_
 
@@ -102,5 +100,3 @@ protected:
 }
 
 #endif
-#endif
-
diff --git a/source/Irrlicht/COGLES2Renderer2D.h b/source/Irrlicht/COGLES2Renderer2D.h
index 1d69828b..0ba39f8c 100644
--- a/source/Irrlicht/COGLES2Renderer2D.h
+++ b/source/Irrlicht/COGLES2Renderer2D.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_OGLES2_RENDERER_2D_H_INCLUDED__
-#define __C_OGLES2_RENDERER_2D_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OGLES2_
 
@@ -37,5 +35,3 @@ protected:
 }
 
 #endif
-#endif
-
diff --git a/source/Irrlicht/COGLESCommon.h b/source/Irrlicht/COGLESCommon.h
index 57e5b7bd..de64bff6 100644
--- a/source/Irrlicht/COGLESCommon.h
+++ b/source/Irrlicht/COGLESCommon.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OGLES_COMMON_H_INCLUDED__
-#define __C_OGLES_COMMON_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OGLES1_
 
@@ -119,4 +117,3 @@ namespace video
 }
 
 #endif
-#endif
diff --git a/source/Irrlicht/COGLESDriver.h b/source/Irrlicht/COGLESDriver.h
index 74280946..7b0caf82 100644
--- a/source/Irrlicht/COGLESDriver.h
+++ b/source/Irrlicht/COGLESDriver.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_OGLES1_DRIVER_H_INCLUDED__
-#define __C_OGLES1_DRIVER_H_INCLUDED__
-
+#pragma once
 
 #include "SIrrCreationParameters.h"
 
@@ -358,5 +356,3 @@ namespace video
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_OGLES1_
-
-#endif
diff --git a/source/Irrlicht/COGLESExtensionHandler.h b/source/Irrlicht/COGLESExtensionHandler.h
index bcc3278b..59a47174 100644
--- a/source/Irrlicht/COGLESExtensionHandler.h
+++ b/source/Irrlicht/COGLESExtensionHandler.h
@@ -3,9 +3,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_OGLES_EXTENSION_HANDLER_H_INCLUDED__
-#define __C_OGLES_EXTENSION_HANDLER_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OGLES1_
 
@@ -236,4 +234,3 @@ namespace video
 }
 
 #endif
-#endif
diff --git a/source/Irrlicht/COGLESMaterialRenderer.h b/source/Irrlicht/COGLESMaterialRenderer.h
index 0e3b5f66..547ea7fb 100644
--- a/source/Irrlicht/COGLESMaterialRenderer.h
+++ b/source/Irrlicht/COGLESMaterialRenderer.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OGLES1_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_OGLES1_MATERIAL_RENDERER_H_INCLUDED__
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OGLES1_
 
@@ -286,4 +285,3 @@ public:
 } // end namespace irr
 
 #endif
-#endif
diff --git a/source/Irrlicht/COSOperator.h b/source/Irrlicht/COSOperator.h
index 941dacc1..e02c6893 100644
--- a/source/Irrlicht/COSOperator.h
+++ b/source/Irrlicht/COSOperator.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OS_OPERATOR_H_INCLUDED__
-#define __C_OS_OPERATOR_H_INCLUDED__
+#pragma once
 
 #include "IOSOperator.h"
 
@@ -70,6 +69,3 @@ private:
 };
 
 } // end namespace
-
-#endif
-
diff --git a/source/Irrlicht/COpenGLCacheHandler.h b/source/Irrlicht/COpenGLCacheHandler.h
index 11c8a296..61855756 100644
--- a/source/Irrlicht/COpenGLCacheHandler.h
+++ b/source/Irrlicht/COpenGLCacheHandler.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_OPENGL_CACHE_HANDLER_H_INCLUDED__
-#define __C_OPENGL_CACHE_HANDLER_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
@@ -62,4 +60,3 @@ namespace video
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_OPENGL_
-#endif
diff --git a/source/Irrlicht/COpenGLCommon.h b/source/Irrlicht/COpenGLCommon.h
index 52a0604a..fd269e6b 100644
--- a/source/Irrlicht/COpenGLCommon.h
+++ b/source/Irrlicht/COpenGLCommon.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OPENGL_COMMON_H_INCLUDED__
-#define __C_OPENGL_COMMON_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
@@ -192,4 +190,3 @@ namespace video
 }
 
 #endif
-#endif
diff --git a/source/Irrlicht/COpenGLCoreCacheHandler.h b/source/Irrlicht/COpenGLCoreCacheHandler.h
index 02dc1865..85054832 100644
--- a/source/Irrlicht/COpenGLCoreCacheHandler.h
+++ b/source/Irrlicht/COpenGLCoreCacheHandler.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__
-#define __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__
-
+#pragma once
 
 #include "SMaterial.h"
 #include "ITexture.h"
@@ -639,5 +637,3 @@ protected:
 
 }
 }
-
-#endif
diff --git a/source/Irrlicht/COpenGLCoreFeature.h b/source/Irrlicht/COpenGLCoreFeature.h
index fa930bd0..8e1734f4 100644
--- a/source/Irrlicht/COpenGLCoreFeature.h
+++ b/source/Irrlicht/COpenGLCoreFeature.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OGLCORE_FEATURE_H_INCLUDED__
-#define __C_OGLCORE_FEATURE_H_INCLUDED__
-
+#pragma once
 
 #include "irrTypes.h"
 
@@ -25,7 +23,7 @@ public:
 	}
 
 	bool BlendOperation;
-	
+
 	u8 ColorAttachment;
 	u8 MultipleRenderTarget;
 	u8 MaxTextureUnits;
@@ -33,5 +31,3 @@ public:
 
 }
 }
-
-#endif
diff --git a/source/Irrlicht/COpenGLCoreRenderTarget.h b/source/Irrlicht/COpenGLCoreRenderTarget.h
index f96fb87d..7d6ee4bf 100644
--- a/source/Irrlicht/COpenGLCoreRenderTarget.h
+++ b/source/Irrlicht/COpenGLCoreRenderTarget.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OGLCORE_RENDER_TARGET_H_INCLUDED__
-#define __C_OGLCORE_RENDER_TARGET_H_INCLUDED__
-
+#pragma once
 
 #include "IRenderTarget.h"
 
@@ -135,7 +133,7 @@ public:
 			TOpenGLTexture* currentTexture = (depthStencil && depthStencil->getDriverType() == DriverType) ? static_cast<TOpenGLTexture*>(depthStencil) : 0;
 
 			if (currentTexture)
-			{	
+			{
 				if (currentTexture->getType() == ETT_2D)
 				{
 					GLuint textureID = currentTexture->getOpenGLTextureName();
@@ -396,5 +394,3 @@ protected:
 
 }
 }
-
-#endif
diff --git a/source/Irrlicht/COpenGLCoreTexture.h b/source/Irrlicht/COpenGLCoreTexture.h
index 7b8e319b..984d2ecc 100644
--- a/source/Irrlicht/COpenGLCoreTexture.h
+++ b/source/Irrlicht/COpenGLCoreTexture.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OGLCORE_TEXTURE_H_INCLUDED__
-#define __C_OGLCORE_TEXTURE_H_INCLUDED__
-
+#pragma once
 
 #include "irrArray.h"
 #include "SMaterialLayer.h"
@@ -662,5 +660,3 @@ protected:
 
 }
 }
-
-#endif
diff --git a/source/Irrlicht/COpenGLDriver.h b/source/Irrlicht/COpenGLDriver.h
index c60d2ba8..e7f6248f 100644
--- a/source/Irrlicht/COpenGLDriver.h
+++ b/source/Irrlicht/COpenGLDriver.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_VIDEO_OPEN_GL_H_INCLUDED__
-#define __C_VIDEO_OPEN_GL_H_INCLUDED__
-
+#pragma once
 
 #include "SIrrCreationParameters.h"
 
@@ -492,5 +490,3 @@ namespace video
 
 
 #endif // _IRR_COMPILE_WITH_OPENGL_
-#endif
-
diff --git a/source/Irrlicht/COpenGLExtensionHandler.h b/source/Irrlicht/COpenGLExtensionHandler.h
index 5d748d59..ac239f01 100644
--- a/source/Irrlicht/COpenGLExtensionHandler.h
+++ b/source/Irrlicht/COpenGLExtensionHandler.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_OPEN_GL_FEATURE_MAP_H_INCLUDED__
-#define __C_OPEN_GL_FEATURE_MAP_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
@@ -3435,6 +3433,3 @@ inline void COpenGLExtensionHandler::extGlSwapInterval(int interval)
 }
 
 #endif
-
-#endif
-
diff --git a/source/Irrlicht/COpenGLMaterialRenderer.h b/source/Irrlicht/COpenGLMaterialRenderer.h
index 3779f46e..805f902c 100644
--- a/source/Irrlicht/COpenGLMaterialRenderer.h
+++ b/source/Irrlicht/COpenGLMaterialRenderer.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
@@ -355,5 +354,3 @@ protected:
 } // end namespace irr
 
 #endif
-#endif
-
diff --git a/source/Irrlicht/COpenGLSLMaterialRenderer.h b/source/Irrlicht/COpenGLSLMaterialRenderer.h
index c8fa1f96..4a4e4f9b 100644
--- a/source/Irrlicht/COpenGLSLMaterialRenderer.h
+++ b/source/Irrlicht/COpenGLSLMaterialRenderer.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
@@ -66,7 +64,7 @@ public:
 
 	//! Access the callback provided by the users when creating shader materials
 	IShaderConstantSetCallBack* getShaderConstantSetCallBack() const override
-	{ 
+	{
 		return CallBack;
 	}
 
@@ -130,5 +128,3 @@ protected:
 } // end namespace irr
 
 #endif // compile with OpenGL
-#endif // if included
-
diff --git a/source/Irrlicht/COpenGLShaderMaterialRenderer.h b/source/Irrlicht/COpenGLShaderMaterialRenderer.h
index ea2f8bc3..9ca99262 100644
--- a/source/Irrlicht/COpenGLShaderMaterialRenderer.h
+++ b/source/Irrlicht/COpenGLShaderMaterialRenderer.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
@@ -45,7 +43,7 @@ public:
 
 	//! Access the callback provided by the users when creating shader materials
 	IShaderConstantSetCallBack* getShaderConstantSetCallBack() const override
-	{ 
+	{
 		return CallBack;
 	}
 
@@ -69,10 +67,10 @@ protected:
 	IShaderConstantSetCallBack* CallBack;
 
 	// I didn't write this, but here's my understanding:
-	// Those flags seem to be exclusive so far (so could be an enum). 
+	// Those flags seem to be exclusive so far (so could be an enum).
 	// Maybe the idea was to make them non-exclusive in future (basically having a shader-material)
 	// Actually currently there's not even any need to cache them (probably even slower than not doing so).
-	// They seem to be mostly for downward compatibility. 
+	// They seem to be mostly for downward compatibility.
 	// I suppose the idea is to use SMaterial.BlendOperation + SMaterial.BlendFactor and a simple non-transparent type as base for more flexibility in the future.
 	// Note that SMaterial.BlendOperation + SMaterial.BlendFactor are in some drivers already evaluated before OnSetMaterial.
 	bool Alpha;
@@ -91,5 +89,3 @@ protected:
 } // end namespace irr
 
 #endif
-#endif
-
diff --git a/source/Irrlicht/CReadFile.h b/source/Irrlicht/CReadFile.h
index c029b3dd..65bcee40 100644
--- a/source/Irrlicht/CReadFile.h
+++ b/source/Irrlicht/CReadFile.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_READ_FILE_H_INCLUDED__
-#define __C_READ_FILE_H_INCLUDED__
+#pragma once
 
 #include <stdio.h>
 #include "IReadFile.h"
@@ -69,5 +68,3 @@ namespace io
 } // end namespace io
 } // end namespace irr
 
-#endif
-
diff --git a/source/Irrlicht/CSDLManager.h b/source/Irrlicht/CSDLManager.h
index f1472424..b8aa1cfb 100644
--- a/source/Irrlicht/CSDLManager.h
+++ b/source/Irrlicht/CSDLManager.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_SDL_MANAGER_H_INCLUDED__
-#define __C_SDL_MANAGER_H_INCLUDED__
-
+#pragma once
 
 #if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
 
@@ -49,4 +47,3 @@ namespace video
 }
 
 #endif
-#endif
diff --git a/source/Irrlicht/CSceneCollisionManager.h b/source/Irrlicht/CSceneCollisionManager.h
index 870b5d1e..d634e6a2 100644
--- a/source/Irrlicht/CSceneCollisionManager.h
+++ b/source/Irrlicht/CSceneCollisionManager.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
-#define __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
+#pragma once
 
 #include "ISceneCollisionManager.h"
 #include "ISceneManager.h"
@@ -37,5 +36,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/CSceneManager.h b/source/Irrlicht/CSceneManager.h
index 4b1beec8..dd4798d3 100644
--- a/source/Irrlicht/CSceneManager.h
+++ b/source/Irrlicht/CSceneManager.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_SCENE_MANAGER_H_INCLUDED__
-#define __C_SCENE_MANAGER_H_INCLUDED__
+#pragma once
 
 #include "ISceneManager.h"
 #include "ISceneNode.h"
@@ -307,6 +306,3 @@ namespace scene
 
 } // end namespace video
 } // end namespace scene
-
-#endif
-
diff --git a/source/Irrlicht/CSkinnedMesh.h b/source/Irrlicht/CSkinnedMesh.h
index c1777769..886e59c2 100644
--- a/source/Irrlicht/CSkinnedMesh.h
+++ b/source/Irrlicht/CSkinnedMesh.h
@@ -4,8 +4,7 @@
 
 //New skinned mesh
 
-#ifndef __C_SKINNED_MESH_H_INCLUDED__
-#define __C_SKINNED_MESH_H_INCLUDED__
+#pragma once
 
 #include "ISkinnedMesh.h"
 #include "SMeshBuffer.h"
@@ -215,6 +214,3 @@ private:
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/CTimer.h b/source/Irrlicht/CTimer.h
index d3b6ca5e..7dd66075 100644
--- a/source/Irrlicht/CTimer.h
+++ b/source/Irrlicht/CTimer.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_IRR_C_TIMER_H_INCLUDED__
-#define __C_IRR_C_TIMER_H_INCLUDED__
+#pragma once
 
 #include "ITimer.h"
 #include "os.h"
@@ -103,5 +102,3 @@ namespace irr
 
 } // end namespace
 
-#endif
-
diff --git a/source/Irrlicht/CWGLManager.h b/source/Irrlicht/CWGLManager.h
index e2d15130..2017151d 100644
--- a/source/Irrlicht/CWGLManager.h
+++ b/source/Irrlicht/CWGLManager.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_WGL_MANAGER_H_INCLUDED__
-#define __C_WGL_MANAGER_H_INCLUDED__
-
+#pragma once
 
 #ifdef _IRR_COMPILE_WITH_WGL_MANAGER_
 
@@ -76,5 +74,3 @@ namespace video
 }
 
 #endif
-
-#endif
diff --git a/source/Irrlicht/CWebGL1Driver.h b/source/Irrlicht/CWebGL1Driver.h
index 73c5a21f..d97130cd 100644
--- a/source/Irrlicht/CWebGL1Driver.h
+++ b/source/Irrlicht/CWebGL1Driver.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __C_WEBGL1_DRIVER_H_INCLUDED__
-#define __C_WEBGL1_DRIVER_H_INCLUDED__
-
+#pragma once
 
 #include "SIrrCreationParameters.h"
 
@@ -141,5 +139,3 @@ namespace video
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_WEBGL1_
-
-#endif // __C_WEBGL1_DRIVER_H_INCLUDED__
diff --git a/source/Irrlicht/CWebGLExtensionHandler.h b/source/Irrlicht/CWebGLExtensionHandler.h
index 9a78df3c..66b9d8a4 100644
--- a/source/Irrlicht/CWebGLExtensionHandler.h
+++ b/source/Irrlicht/CWebGLExtensionHandler.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#ifndef __E_WEGL_EXTENSION_HANDLER_H_INCLUDED__
-#define __E_WEGL_EXTENSION_HANDLER_H_INCLUDED__
-
+#pragma once
 
 #if defined(_IRR_COMPILE_WITH_WEBGL1_)	// Note: should also work with WebGL2 once we add that to Irrlicht
 
@@ -178,4 +176,3 @@ namespace video
 }
 
 #endif // defined(_IRR_COMPILE_WITH_WEBGL1_)
-#endif // __E_WEGL1_EXTENSION_HANDLER_H_INCLUDED__
diff --git a/source/Irrlicht/CWriteFile.h b/source/Irrlicht/CWriteFile.h
index b09314b0..781bf5c8 100644
--- a/source/Irrlicht/CWriteFile.h
+++ b/source/Irrlicht/CWriteFile.h
@@ -2,10 +2,9 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_WRITE_FILE_H_INCLUDED__
-#define __C_WRITE_FILE_H_INCLUDED__
+#pragma once
 
-#include <stdio.h>
+#include <cstdio>
 #include "IWriteFile.h"
 #include "irrString.h"
 
@@ -59,6 +58,3 @@ namespace io
 
 } // end namespace io
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/CXMeshFileLoader.h b/source/Irrlicht/CXMeshFileLoader.h
index ca934a88..d4a85fac 100644
--- a/source/Irrlicht/CXMeshFileLoader.h
+++ b/source/Irrlicht/CXMeshFileLoader.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_X_MESH_FILE_LOADER_H_INCLUDED__
-#define __C_X_MESH_FILE_LOADER_H_INCLUDED__
+#pragma once
 
 #include "IMeshLoader.h"
 #include "irrString.h"
@@ -180,5 +179,3 @@ private:
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/CZipReader.h b/source/Irrlicht/CZipReader.h
index 6b16ab9d..e19077f3 100644
--- a/source/Irrlicht/CZipReader.h
+++ b/source/Irrlicht/CZipReader.h
@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_ZIP_READER_H_INCLUDED__
-#define __C_ZIP_READER_H_INCLUDED__
-
+#pragma once
 
 #include "IReadFile.h"
 #include "irrArray.h"
@@ -222,5 +220,3 @@ namespace io
 
 } // end namespace io
 } // end namespace irr
-
-#endif // __C_ZIP_READER_H_INCLUDED__
diff --git a/source/Irrlicht/IAttribute.h b/source/Irrlicht/IAttribute.h
index 28577aea..22d5294e 100644
--- a/source/Irrlicht/IAttribute.h
+++ b/source/Irrlicht/IAttribute.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ATTRIBUTE_H_INCLUDED__
-#define __I_ATTRIBUTE_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "SColor.h"
@@ -62,5 +61,3 @@ public:
 
 } // end namespace io
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/S2DVertex.h b/source/Irrlicht/S2DVertex.h
index f6f6a885..ad0fd4a6 100644
--- a/source/Irrlicht/S2DVertex.h
+++ b/source/Irrlicht/S2DVertex.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __S_K_2D_VERTEX_H_INCLUDED__
-#define __S_K_2D_VERTEX_H_INCLUDED__
+#pragma once
 
 #include "vector2d.h"
 
@@ -25,6 +24,3 @@ namespace video
 
 } // end namespace video
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/SB3DStructs.h b/source/Irrlicht/SB3DStructs.h
index ddd8bd63..062183a3 100644
--- a/source/Irrlicht/SB3DStructs.h
+++ b/source/Irrlicht/SB3DStructs.h
@@ -7,8 +7,7 @@
 // declared public domain
 
 
-#ifndef SB3DSTRUCTS_H
-#define SB3DSTRUCTS_H
+#pragma once
 
 #include "SMaterial.h"
 
@@ -66,5 +65,3 @@ struct SB3dMaterial
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
diff --git a/source/Irrlicht/SoftwareDriver2_helper.h b/source/Irrlicht/SoftwareDriver2_helper.h
index a864a57f..da8c9841 100644
--- a/source/Irrlicht/SoftwareDriver2_helper.h
+++ b/source/Irrlicht/SoftwareDriver2_helper.h
@@ -7,8 +7,7 @@
 	- changed behavior for log2 textures ( replaced multiplies by shift )
 */
 
-#ifndef __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__
-#define __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__
+#pragma once
 
 #include "irrMath.h"
 #include "SMaterial.h"
@@ -300,6 +299,3 @@ inline bool intersect ( AbsRectangle &dest, const AbsRectangle& a, const AbsRect
 
 
 } // end namespace irr
-
-#endif
-
diff --git a/source/Irrlicht/os.h b/source/Irrlicht/os.h
index dc1a154a..3db0b749 100644
--- a/source/Irrlicht/os.h
+++ b/source/Irrlicht/os.h
@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_OS_H_INCLUDED__
-#define __IRR_OS_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 #include "irrString.h"
@@ -95,7 +94,3 @@ namespace os
 
 } // end namespace os
 } // end namespace irr
-
-
-#endif
-