diff --git a/Server/core/CCrashHandler.h b/Server/core/CCrashHandler.h
index c6b509fb612..0f6e965a82d 100644
--- a/Server/core/CCrashHandler.h
+++ b/Server/core/CCrashHandler.h
@@ -9,8 +9,7 @@
  *
  *****************************************************************************/
 
-#ifndef __CCRASHHANDLER_H
-#define __CCRASHHANDLER_H
+#pragma once
 
 #include "CCrashHandlerAPI.h"
 
@@ -39,5 +38,3 @@ class CCrashHandler
 
     #endif
 };
-
-#endif
diff --git a/Server/core/CCrashHandlerAPI.h b/Server/core/CCrashHandlerAPI.h
index 3cecf074439..4e8db2d9aeb 100644
--- a/Server/core/CCrashHandlerAPI.h
+++ b/Server/core/CCrashHandlerAPI.h
@@ -17,8 +17,7 @@
 Copyright (c) 1997-2000 John Robbins -- All rights reserved.
 ----------------------------------------------------------------------*/
 
-#ifndef _CRASHHANDLER_H
-#define _CRASHHANDLER_H
+#pragma once
 
 #ifdef WIN32
 
@@ -245,5 +244,3 @@ RETURNS         :
 #endif  //__cplusplus
 
 #endif
-
-#endif  // _CRASHHANDLER_H
diff --git a/Server/core/CDynamicLibrary.h b/Server/core/CDynamicLibrary.h
index a4177307506..e1567160cec 100644
--- a/Server/core/CDynamicLibrary.h
+++ b/Server/core/CDynamicLibrary.h
@@ -9,8 +9,7 @@
  *
  *****************************************************************************/
 
-#ifndef __CDYNAMICLIBRARY_H
-#define __CDYNAMICLIBRARY_H
+#pragma once
 
 #ifdef WIN32
 #include <windows.h>
@@ -38,5 +37,3 @@ class CDynamicLibrary
     void* m_hModule;
     #endif
 };
-
-#endif
diff --git a/Server/core/CExceptionInformation_Impl.h b/Server/core/CExceptionInformation_Impl.h
index 61d12ec30f1..db3bcd275b1 100644
--- a/Server/core/CExceptionInformation_Impl.h
+++ b/Server/core/CExceptionInformation_Impl.h
@@ -9,8 +9,7 @@
  *
  *****************************************************************************/
 
-#ifndef __CEXCEPTIONINFORMATION_IMPL_H
-#define __CEXCEPTIONINFORMATION_IMPL_H
+#pragma once
 
 #include <core/CExceptionInformation.h>
 #include <windows.h>
@@ -70,5 +69,3 @@ class CExceptionInformation_Impl : public CExceptionInformation
     unsigned long m_ulSS;
     unsigned long m_ulEFlags;
 };
-
-#endif
diff --git a/Server/core/CModManagerImpl.h b/Server/core/CModManagerImpl.h
index f4b0f9d21eb..fbe43fb2776 100644
--- a/Server/core/CModManagerImpl.h
+++ b/Server/core/CModManagerImpl.h
@@ -11,8 +11,7 @@
 
 class CModManagerImpl;
 
-#ifndef __CMODMANAGERIMPL_H
-#define __CMODMANAGERIMPL_H
+#pragma once
 
 #include <core/CModManager.h>
 #include <core/CServerBase.h>
@@ -61,5 +60,3 @@ class CModManagerImpl : public CModManager
     SString         m_strServerPath;            // Root path
     SString         m_strModPath;               // root/mods/deathmatch
 };
-
-#endif
diff --git a/Server/core/CServerImpl.h b/Server/core/CServerImpl.h
index 7678fe2068f..8d9c9031b2d 100644
--- a/Server/core/CServerImpl.h
+++ b/Server/core/CServerImpl.h
@@ -11,8 +11,7 @@
 
 class CServerImpl;
 
-#ifndef __CSERVERIMPL_H
-#define __CSERVERIMPL_H
+#pragma once
 
 #include "MTAPlatform.h"
 #include <string>
@@ -111,5 +110,3 @@ class CServerImpl : public CServerInterface
     CThreadCommandQueue* m_pThreadCommandQueue;
 #endif
 };
-
-#endif
diff --git a/Server/core/CThreadCommandQueue.h b/Server/core/CThreadCommandQueue.h
index bcff9e1fb3a..202cf9247dd 100644
--- a/Server/core/CThreadCommandQueue.h
+++ b/Server/core/CThreadCommandQueue.h
@@ -9,8 +9,7 @@
  *
  *****************************************************************************/
 
-#ifndef __CTHREADCOMMANDQUEUE_H
-#define __CTHREADCOMMANDQUEUE_H
+#pragma once
 
 #ifdef WIN32
 
@@ -29,5 +28,3 @@ class CThreadCommandQueue
 };
 
 #endif
-
-#endif
diff --git a/Server/core/ErrorCodes.h b/Server/core/ErrorCodes.h
index ff5f5750a08..8d85bc7806b 100644
--- a/Server/core/ErrorCodes.h
+++ b/Server/core/ErrorCodes.h
@@ -9,13 +9,10 @@
  *
  *****************************************************************************/
 
-#ifndef __ERRORCODES_H
-#define __ERRORCODES_H
+#pragma once
 
 #define ERROR_NO_ERROR 0
 #define ERROR_NO_NETWORK_LIBRARY 1
 #define ERROR_NETWORK_LIBRARY_FAILED 2
 #define ERROR_LOADING_MOD 3
 #define ERROR_OTHER 4
-
-#endif