From cb42dceb879b675e9a8f9eba0cd67ebd5fc7b72d Mon Sep 17 00:00:00 2001
From: Lemongrass3110 <lemongrass@kstp.at>
Date: Sun, 7 Apr 2024 22:14:51 +0200
Subject: [PATCH] Switched most C headers to C++ (#8225)

---
 src/char/char.cpp            | 11 +++++------
 src/char/char_clif.cpp       |  5 ++---
 src/char/char_cnslif.cpp     |  4 ++--
 src/char/char_logif.cpp      |  5 ++---
 src/char/char_mapif.cpp      |  5 ++---
 src/char/int_achievement.cpp |  6 +++---
 src/char/int_auction.cpp     |  7 +++----
 src/char/int_clan.cpp        |  5 ++---
 src/char/int_elemental.cpp   |  4 ++--
 src/char/int_guild.cpp       |  6 ++----
 src/char/int_homun.cpp       |  4 ++--
 src/char/int_mail.cpp        |  5 ++---
 src/char/int_mercenary.cpp   |  4 ++--
 src/char/int_party.cpp       |  5 ++---
 src/char/int_pet.cpp         |  4 ++--
 src/char/int_quest.cpp       |  4 ++--
 src/char/int_storage.cpp     |  4 ++--
 src/char/inter.cpp           |  6 +++---
 src/common/cbasetypes.hpp    | 11 +++++------
 src/common/cli.cpp           |  6 +++---
 src/common/core.cpp          |  6 ++++--
 src/common/core.hpp          |  2 +-
 src/common/db.cpp            |  4 ++--
 src/common/db.hpp            |  3 +--
 src/common/ers.cpp           |  4 ++--
 src/common/grfio.cpp         |  3 ++-
 src/common/malloc.cpp        |  9 +++------
 src/common/mapindex.cpp      |  2 +-
 src/common/md5calc.cpp       |  4 ++--
 src/common/mmo.hpp           |  2 +-
 src/common/msg_conf.cpp      |  6 +++---
 src/common/nullpo.cpp        |  6 +++---
 src/common/showmsg.cpp       |  4 ++--
 src/common/socket.cpp        |  4 ++--
 src/common/socket.hpp        |  3 ++-
 src/common/sql.cpp           |  3 ++-
 src/common/sql.hpp           |  2 +-
 src/common/strlib.cpp        |  3 +--
 src/common/strlib.hpp        | 11 +++++------
 src/common/timer.cpp         | 13 +++++--------
 src/common/timer.hpp         |  2 +-
 src/common/utils.cpp         |  6 +++---
 src/common/utils.hpp         |  2 +-
 src/login/account.cpp        |  4 ++--
 src/login/ipban.cpp          |  4 ++--
 src/login/login.cpp          |  4 ++--
 src/login/loginchrif.cpp     |  4 ++--
 src/login/loginclif.cpp      |  4 ++--
 src/login/logincnslif.cpp    |  4 ++--
 src/login/loginlog.cpp       |  3 +--
 src/map/achievement.cpp      |  8 ++++----
 src/map/atcommand.cpp        |  5 ++---
 src/map/battle.cpp           |  4 ++--
 src/map/buyingstore.cpp      |  2 +-
 src/map/cashshop.cpp         |  4 ++--
 src/map/channel.cpp          |  2 +-
 src/map/chrif.hpp            |  2 +-
 src/map/clan.cpp             |  2 +-
 src/map/clif.cpp             |  3 +--
 src/map/clif.hpp             |  3 +--
 src/map/date.cpp             |  2 +-
 src/map/duel.cpp             |  4 ++--
 src/map/elemental.cpp        |  2 +-
 src/map/guild.cpp            |  2 +-
 src/map/homunculus.cpp       |  2 +-
 src/map/instance.cpp         |  4 ++--
 src/map/intif.cpp            |  2 +-
 src/map/itemdb.cpp           |  4 ++--
 src/map/log.cpp              |  2 +-
 src/map/map.cpp              |  4 ++--
 src/map/map.hpp              |  2 +-
 src/map/mapreg.cpp           |  2 +-
 src/map/mercenary.cpp        |  4 ++--
 src/map/mob.cpp              |  4 ++--
 src/map/npc.cpp              |  4 ++--
 src/map/party.cpp            |  2 +-
 src/map/party.hpp            |  2 +-
 src/map/path.cpp             |  8 ++++----
 src/map/pc.cpp               |  5 ++---
 src/map/pet.cpp              |  3 +--
 src/map/quest.cpp            |  2 +-
 src/map/script.cpp           |  8 ++++----
 src/map/skill.cpp            | 10 +++++-----
 src/map/status.cpp           |  4 ++--
 src/map/storage.cpp          |  5 ++---
 src/map/trade.cpp            |  4 ++--
 src/map/unit.cpp             |  4 ++--
 src/map/vending.cpp          |  2 +-
 src/tool/csv2yaml.cpp        |  2 +-
 src/tool/mapcache.cpp        |  6 +++---
 src/tool/yaml.hpp            |  2 +-
 src/tool/yaml2sql.cpp        |  2 +-
 src/web/auth.cpp             |  2 +-
 src/web/web.cpp              |  4 ++--
 94 files changed, 188 insertions(+), 210 deletions(-)

diff --git a/src/char/char.cpp b/src/char/char.cpp
index b660f186ea..7f898d97d5 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -4,15 +4,14 @@
 #pragma warning(disable:4800)
 #include "char.hpp"
 
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 #include <memory>
 #include <unordered_map>
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
 #include <common/cbasetypes.hpp>
 #include <common/cli.hpp>
 #include <common/core.hpp>
diff --git a/src/char/char_clif.cpp b/src/char/char_clif.cpp
index 0ead36110d..d75db18b00 100644
--- a/src/char/char_clif.cpp
+++ b/src/char/char_clif.cpp
@@ -3,13 +3,12 @@
 
 #include "char_clif.hpp"
 
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <common/malloc.hpp>
 #include <common/mapindex.hpp>
 #include <common/mmo.hpp>
diff --git a/src/char/char_cnslif.cpp b/src/char/char_cnslif.cpp
index 9c1bf2fcfd..392f5b6b06 100644
--- a/src/char/char_cnslif.cpp
+++ b/src/char/char_cnslif.cpp
@@ -3,8 +3,8 @@
 
 #include "char_cnslif.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/cli.hpp>
 #include <common/ers.hpp>
diff --git a/src/char/char_logif.cpp b/src/char/char_logif.cpp
index c656e42fe6..ce5542c7c7 100644
--- a/src/char/char_logif.cpp
+++ b/src/char/char_logif.cpp
@@ -3,11 +3,10 @@
 
 #include "char_logif.hpp"
 
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <common/showmsg.hpp>
 #include <common/socket.hpp>
 #include <common/sql.hpp>
diff --git a/src/char/char_mapif.cpp b/src/char/char_mapif.cpp
index 7fb33394c3..a2c7282d9f 100644
--- a/src/char/char_mapif.cpp
+++ b/src/char/char_mapif.cpp
@@ -3,11 +3,10 @@
 
 #include "char_mapif.hpp"
 
+#include <cstdlib>
+#include <cstring> //memcpy
 #include <memory>
 
-#include <stdlib.h>
-#include <string.h> //memcpy
-
 #include <common/malloc.hpp>
 #include <common/showmsg.hpp>
 #include <common/socket.hpp>
diff --git a/src/char/int_achievement.cpp b/src/char/int_achievement.cpp
index d778fd993b..68c88238ec 100644
--- a/src/char/int_achievement.cpp
+++ b/src/char/int_achievement.cpp
@@ -3,9 +3,9 @@
 
 #include "int_achievement.hpp"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/db.hpp>
 #include <common/malloc.hpp>
diff --git a/src/char/int_auction.cpp b/src/char/int_auction.cpp
index ce4197834a..24b4a0718d 100644
--- a/src/char/int_auction.cpp
+++ b/src/char/int_auction.cpp
@@ -3,13 +3,12 @@
 
 #include "int_auction.hpp"
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 #include <unordered_map>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <common/malloc.hpp>
 #include <common/mmo.hpp>
 #include <common/showmsg.hpp>
diff --git a/src/char/int_clan.cpp b/src/char/int_clan.cpp
index 9427a4fc1c..e89dab519e 100644
--- a/src/char/int_clan.cpp
+++ b/src/char/int_clan.cpp
@@ -3,13 +3,12 @@
 
 #include "int_clan.hpp"
 
+#include <cstdlib>
+#include <cstring> //memset
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
-#include <stdlib.h>
-#include <string.h> //memset
-
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>
 #include <common/mmo.hpp>
diff --git a/src/char/int_elemental.cpp b/src/char/int_elemental.cpp
index b2a64432cc..9037f5a1ac 100644
--- a/src/char/int_elemental.cpp
+++ b/src/char/int_elemental.cpp
@@ -3,8 +3,8 @@
 
 #include "int_elemental.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/mmo.hpp>
 #include <common/showmsg.hpp>
diff --git a/src/char/int_guild.cpp b/src/char/int_guild.cpp
index 8f4bcaa3b6..0520f4deae 100644
--- a/src/char/int_guild.cpp
+++ b/src/char/int_guild.cpp
@@ -3,13 +3,11 @@
 
 #include "int_guild.hpp"
 
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 #include <unordered_map>
 
-#include <stdlib.h>
-#define __STDC_WANT_LIB_EXT1__ 1
-#include <string.h>
-
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>
 #include <common/mmo.hpp>
diff --git a/src/char/int_homun.cpp b/src/char/int_homun.cpp
index 856503cb90..cce0feaedc 100644
--- a/src/char/int_homun.cpp
+++ b/src/char/int_homun.cpp
@@ -3,8 +3,8 @@
 
 #include "int_homun.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/mmo.hpp>
 #include <common/showmsg.hpp>
diff --git a/src/char/int_mail.cpp b/src/char/int_mail.cpp
index da265ed32d..37c8b0d89e 100644
--- a/src/char/int_mail.cpp
+++ b/src/char/int_mail.cpp
@@ -3,11 +3,10 @@
 
 #include "int_mail.hpp"
 
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <common/mmo.hpp>
 #include <common/showmsg.hpp>
 #include <common/socket.hpp>
diff --git a/src/char/int_mercenary.cpp b/src/char/int_mercenary.cpp
index 50c26aaa06..e21995904e 100644
--- a/src/char/int_mercenary.cpp
+++ b/src/char/int_mercenary.cpp
@@ -3,8 +3,8 @@
 
 #include "int_mercenary.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/mmo.hpp>
 #include <common/showmsg.hpp>
diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp
index d1e956ca15..1943ab3478 100644
--- a/src/char/int_party.cpp
+++ b/src/char/int_party.cpp
@@ -3,12 +3,11 @@
 
 #include "int_party.hpp"
 
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 #include <unordered_map>
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>
 #include <common/mmo.hpp>
diff --git a/src/char/int_pet.cpp b/src/char/int_pet.cpp
index 8d2b489218..1f547ae76f 100644
--- a/src/char/int_pet.cpp
+++ b/src/char/int_pet.cpp
@@ -3,8 +3,8 @@
 
 #include "int_pet.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/malloc.hpp>
 #include <common/mmo.hpp>
diff --git a/src/char/int_quest.cpp b/src/char/int_quest.cpp
index 1e1c26fcbf..76bbaf2ef1 100644
--- a/src/char/int_quest.cpp
+++ b/src/char/int_quest.cpp
@@ -3,8 +3,8 @@
 
 #include "int_quest.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/malloc.hpp>
 #include <common/mmo.hpp>
diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp
index c25236a108..b0fd334152 100644
--- a/src/char/int_storage.cpp
+++ b/src/char/int_storage.cpp
@@ -4,8 +4,8 @@
 #pragma warning(disable:4800) //forcing value to bool
 #include "int_storage.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/malloc.hpp>
 #include <common/mmo.hpp>
diff --git a/src/char/inter.cpp b/src/char/inter.cpp
index 8eb4503373..294c9be5c9 100644
--- a/src/char/inter.cpp
+++ b/src/char/inter.cpp
@@ -3,13 +3,13 @@
 
 #include "inter.hpp"
 
+#include <cstdlib>
+#include <cstring>
+#include <cstring>
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
-#include <stdlib.h>
-#include <string.h>
-#include <string>
 #include <sys/stat.h> // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool]
 
 #include <common/cbasetypes.hpp>
diff --git a/src/common/cbasetypes.hpp b/src/common/cbasetypes.hpp
index 4bf9a031a5..4207c94643 100644
--- a/src/common/cbasetypes.hpp
+++ b/src/common/cbasetypes.hpp
@@ -87,7 +87,7 @@
 #endif
 
 #include <cinttypes>
-#include <limits.h>
+#include <climits>
 
 // temporary fix for bugreport:4961 (unintended conversion from signed to unsigned)
 // (-20 >= UCHAR_MAX) returns true
@@ -178,8 +178,7 @@ typedef unsigned long int   ppuint32;
 //////////////////////////////////////////////////////////////////////////
 // integer with exact processor width (and best speed)
 //////////////////////////////
-#include <stddef.h> // size_t
-//#include <stdbool.h> //boolean
+#include <cstddef> // size_t
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -301,7 +300,7 @@ typedef char bool;
 #define Assert(EX)
 #else
 // extern "C" {
-#include <assert.h>
+#include <cassert>
 // }
 #if !defined(DEFCPP) && defined(WIN32) && !defined(MINGW)
 #include <crtdbg.h>
@@ -313,7 +312,7 @@ typedef char bool;
 //////////////////////////////////////////////////////////////////////////
 // Has to be unsigned to avoid problems in some systems
 // Problems arise when these functions expect an argument in the range [0,256[ and are fed a signed char.
-#include <ctype.h>
+#include <cctype>
 #define ISALNUM(c) (isalnum((unsigned char)(c)))
 #define ISALPHA(c) (isalpha((unsigned char)(c)))
 #define ISCNTRL(c) (iscntrl((unsigned char)(c)))
@@ -335,7 +334,7 @@ typedef char bool;
 
 //////////////////////////////////////////////////////////////////////////
 // Make sure va_copy exists
-#include <stdarg.h> // va_list, va_copy(?)
+#include <cstdarg> // va_list, va_copy(?)
 #if !defined(va_copy)
 #if defined(__va_copy)
 #define va_copy __va_copy
diff --git a/src/common/cli.cpp b/src/common/cli.cpp
index 3803fa8c51..b520cdbc11 100644
--- a/src/common/cli.cpp
+++ b/src/common/cli.cpp
@@ -3,9 +3,9 @@
 
 #include "cli.hpp"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #ifdef WIN32
 	#include <conio.h>
diff --git a/src/common/core.cpp b/src/common/core.cpp
index 8bf5c34079..d295bf2030 100644
--- a/src/common/core.cpp
+++ b/src/common/core.cpp
@@ -3,6 +3,9 @@
 
 #include "core.hpp"
 
+#include <cstdlib>
+#include <csignal>
+
 #include <config/core.hpp>
 
 #ifndef MINICORE
@@ -12,8 +15,7 @@
 #include "timer.hpp"
 #include "sql.hpp"
 #endif
-#include <stdlib.h>
-#include <signal.h>
+
 #ifndef _WIN32
 #include <unistd.h>
 #else
diff --git a/src/common/core.hpp b/src/common/core.hpp
index 601e1d4252..bbf71b5eb3 100644
--- a/src/common/core.hpp
+++ b/src/common/core.hpp
@@ -15,7 +15,7 @@
 
 /* so that developers with --enable-debug can raise signals from any section of the code they'd like */
 #ifdef DEBUG
-	#include <signal.h>
+	#include <csignal>
 #endif
 
 #if defined(BUILDBOT)
diff --git a/src/common/db.cpp b/src/common/db.cpp
index 12b8bc44c3..a61f3b1019 100644
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -70,8 +70,8 @@
 
 #include "db.hpp"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "ers.hpp"
 #include "malloc.hpp"
diff --git a/src/common/db.hpp b/src/common/db.hpp
index be3d12d08c..f5e4b09d48 100644
--- a/src/common/db.hpp
+++ b/src/common/db.hpp
@@ -42,10 +42,9 @@
 #ifndef DB_HPP
 #define DB_HPP
 
+#include <cstdarg>
 #include <utility>
 
-#include <stdarg.h>
-
 #include "cbasetypes.hpp"
 
 /*****************************************************************************\
diff --git a/src/common/ers.cpp b/src/common/ers.cpp
index 29af2037c2..17b63d1794 100644
--- a/src/common/ers.cpp
+++ b/src/common/ers.cpp
@@ -42,8 +42,8 @@
 
 #include "ers.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "cbasetypes.hpp"
 #include "malloc.hpp" // CREATE, RECREATE, aMalloc, aFree
diff --git a/src/common/grfio.cpp b/src/common/grfio.cpp
index fa208a2cc2..a0793e555b 100644
--- a/src/common/grfio.cpp
+++ b/src/common/grfio.cpp
@@ -3,7 +3,8 @@
 
 #include "grfio.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
+
 #include <zlib.h>
 
 #include "cbasetypes.hpp"
diff --git a/src/common/malloc.cpp b/src/common/malloc.cpp
index 0bfa50c1b0..21212f65f3 100644
--- a/src/common/malloc.cpp
+++ b/src/common/malloc.cpp
@@ -3,9 +3,9 @@
 
 #include "malloc.hpp"
 
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 #include "core.hpp"
 #include "showmsg.hpp"
@@ -20,7 +20,6 @@
 
 #if defined(MEMWATCH)
 
-#	include <string.h> 
 #	include "memwatch.h"
 #	define MALLOC(n,file,line,func)	mwMalloc((n),(file),(line))
 #	define CALLOC(m,n,file,line,func)	mwCalloc((m),(n),(file),(line))
@@ -33,8 +32,6 @@
 
 #elif defined(DMALLOC)
 
-#	include <string.h>
-#	include <stdlib.h>
 #	include "dmalloc.hpp"
 #	define MALLOC(n,file,line,func)	dmalloc_malloc((file),(line),(n),DMALLOC_FUNC_MALLOC,0,0)
 #	define CALLOC(m,n,file,line,func)	dmalloc_malloc((file),(line),(m)*(n),DMALLOC_FUNC_CALLOC,0,0)
diff --git a/src/common/mapindex.cpp b/src/common/mapindex.cpp
index 7005160795..6871af4e96 100644
--- a/src/common/mapindex.cpp
+++ b/src/common/mapindex.cpp
@@ -3,7 +3,7 @@
 
 #include "mapindex.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "core.hpp"
 #include "mmo.hpp"
diff --git a/src/common/md5calc.cpp b/src/common/md5calc.cpp
index b718f41a60..2eb92b15c4 100644
--- a/src/common/md5calc.cpp
+++ b/src/common/md5calc.cpp
@@ -11,8 +11,8 @@
 
 #include "md5calc.hpp"
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "random.hpp"
 
diff --git a/src/common/mmo.hpp b/src/common/mmo.hpp
index a2e896a027..4a00641239 100644
--- a/src/common/mmo.hpp
+++ b/src/common/mmo.hpp
@@ -4,7 +4,7 @@
 #ifndef MMO_HPP
 #define MMO_HPP
 
-#include <time.h>
+#include <ctime>
 
 #include <config/core.hpp>
 
diff --git a/src/common/msg_conf.cpp b/src/common/msg_conf.cpp
index e9d5984b35..97bc89ba26 100644
--- a/src/common/msg_conf.cpp
+++ b/src/common/msg_conf.cpp
@@ -3,9 +3,9 @@
 
 #include "msg_conf.hpp"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "malloc.hpp"
 #include "showmsg.hpp"
diff --git a/src/common/nullpo.cpp b/src/common/nullpo.cpp
index 534d318cc6..d8c8c36a42 100644
--- a/src/common/nullpo.cpp
+++ b/src/common/nullpo.cpp
@@ -3,9 +3,9 @@
 
 #include "nullpo.hpp"
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdarg>
+#include <cstring>
 
 #include "showmsg.hpp"
 
diff --git a/src/common/showmsg.cpp b/src/common/showmsg.cpp
index 431d9e7c8c..9102d5851e 100644
--- a/src/common/showmsg.cpp
+++ b/src/common/showmsg.cpp
@@ -3,8 +3,8 @@
 
 #include "showmsg.hpp"
 
-#include <stdlib.h> // atexit
-#include <time.h>
+#include <cstdlib> // atexit
+#include <ctime>
 
 #ifdef WIN32
 	#include "winapi.hpp"
diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index e94777fe42..3c8e8ec8ec 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -3,12 +3,12 @@
 
 #include "socket.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #ifdef WIN32
 	#include "winapi.hpp"
 #else
-	#include <errno.h>
+	#include <cerrno>
 	#include <arpa/inet.h>
 	#include <net/if.h>
 	#include <netdb.h>
diff --git a/src/common/socket.hpp b/src/common/socket.hpp
index 13664a1ea5..b4c61ce686 100644
--- a/src/common/socket.hpp
+++ b/src/common/socket.hpp
@@ -4,6 +4,8 @@
 #ifndef SOCKET_HPP
 #define SOCKET_HPP
 
+#include <ctime>
+
 #include <config/core.hpp>
 
 #ifdef WIN32
@@ -14,7 +16,6 @@
 	#include <sys/socket.h>
 	#include <netinet/in.h>
 #endif
-#include <time.h>
 
 #include "cbasetypes.hpp"
 #include "malloc.hpp"
diff --git a/src/common/sql.cpp b/src/common/sql.cpp
index 785540213a..14fef8e9a1 100644
--- a/src/common/sql.cpp
+++ b/src/common/sql.cpp
@@ -7,8 +7,9 @@
 #include "winapi.hpp"
 #endif
 
+#include <cstdlib>// strtoul
+
 #include <mysql.h>
-#include <stdlib.h>// strtoul
 
 #include "cbasetypes.hpp"
 #include "malloc.hpp"
diff --git a/src/common/sql.hpp b/src/common/sql.hpp
index fc87a4baf9..57db61de82 100644
--- a/src/common/sql.hpp
+++ b/src/common/sql.hpp
@@ -4,7 +4,7 @@
 #ifndef SQL_HPP
 #define SQL_HPP
 
-#include <stdarg.h>// va_list
+#include <cstdarg>// va_list
 
 #include "cbasetypes.hpp"
 
diff --git a/src/common/strlib.cpp b/src/common/strlib.cpp
index 515e1a0e11..3f76aadb5e 100644
--- a/src/common/strlib.cpp
+++ b/src/common/strlib.cpp
@@ -4,8 +4,7 @@
 #include "strlib.hpp"
 
 #include <algorithm>
-
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "cbasetypes.hpp"
 #include "malloc.hpp"
diff --git a/src/common/strlib.hpp b/src/common/strlib.hpp
index fe1ffe18b7..d53f450c4a 100644
--- a/src/common/strlib.hpp
+++ b/src/common/strlib.hpp
@@ -4,21 +4,20 @@
 #ifndef STRLIB_HPP
 #define STRLIB_HPP
 
-#include <stdarg.h>
-
-#include "cbasetypes.hpp"
-#include "malloc.hpp"
-
+#include <cstdarg>
 #if !defined(__USE_GNU)
 #define __USE_GNU  // required to enable strnlen on some platforms
 #define __USED_GNU
 #endif
-#include <string.h>
+#include <cstring>
 #if defined(__USED_GNU)
 #undef __USE_GNU
 #undef __USED_GNU
 #endif
 
+#include "cbasetypes.hpp"
+#include "malloc.hpp"
+
 int remove_control_chars(char* str);
 char* trim(char* str);
 char* normalize_name(char* str,const char* delims);
diff --git a/src/common/timer.cpp b/src/common/timer.cpp
index f1e400e4f0..39531d69b3 100644
--- a/src/common/timer.cpp
+++ b/src/common/timer.cpp
@@ -3,22 +3,19 @@
 
 #include "timer.hpp"
 
+#include <cstdlib>
+#include <cstring>
 #include <utility>
 
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef WIN32
-#include "winapi.hpp" // GetTickCount()
-#else
-#endif
-
 #include "cbasetypes.hpp"
 #include "db.hpp"
 #include "malloc.hpp"
 #include "nullpo.hpp"
 #include "showmsg.hpp"
 #include "utils.hpp"
+#ifdef WIN32
+#include "winapi.hpp" // GetTickCount()
+#endif
 
 // If the server can't handle processing thousands of monsters
 // or many connected clients, please increase TIMER_MIN_INTERVAL.
diff --git a/src/common/timer.hpp b/src/common/timer.hpp
index 5f332647c5..e4d38a7ec8 100644
--- a/src/common/timer.hpp
+++ b/src/common/timer.hpp
@@ -4,7 +4,7 @@
 #ifndef TIMER_HPP
 #define TIMER_HPP
 
-#include <time.h>
+#include <ctime>
 
 #include "cbasetypes.hpp"
 
diff --git a/src/common/utils.cpp b/src/common/utils.cpp
index 9ceff76f1e..14abb672d0 100644
--- a/src/common/utils.cpp
+++ b/src/common/utils.cpp
@@ -3,9 +3,9 @@
 
 #include "utils.hpp"
 
-#include <math.h> // floor()
-#include <stdlib.h>
-#include <string.h>
+#include <cmath> // floor()
+#include <cstdlib>
+#include <cstring>
 
 #ifdef WIN32
 	#include "winapi.hpp"
diff --git a/src/common/utils.hpp b/src/common/utils.hpp
index 5fedcf0138..a5348b2029 100644
--- a/src/common/utils.hpp
+++ b/src/common/utils.hpp
@@ -4,7 +4,7 @@
 #ifndef UTILS_HPP
 #define UTILS_HPP
 
-#include <stdio.h> // FILE*
+#include <cstdio> // FILE*
 
 #include "cbasetypes.hpp"
 
diff --git a/src/login/account.cpp b/src/login/account.cpp
index 0551f68bae..d1fe69a72d 100644
--- a/src/login/account.cpp
+++ b/src/login/account.cpp
@@ -4,8 +4,8 @@
 #include "account.hpp"
 
 #include <algorithm> //min / max
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/malloc.hpp>
 #include <common/mmo.hpp>
diff --git a/src/login/ipban.cpp b/src/login/ipban.cpp
index e052721285..4b0e3c53c9 100644
--- a/src/login/ipban.cpp
+++ b/src/login/ipban.cpp
@@ -3,8 +3,8 @@
 
 #include "ipban.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/cbasetypes.hpp>
 #include <common/showmsg.hpp>
diff --git a/src/login/login.cpp b/src/login/login.cpp
index 8394a163bd..59f486f68b 100644
--- a/src/login/login.cpp
+++ b/src/login/login.cpp
@@ -4,8 +4,8 @@
 #pragma warning(disable:4800)
 #include "login.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <string>
 #include <unordered_map>
 
diff --git a/src/login/loginchrif.cpp b/src/login/loginchrif.cpp
index 03f3217ee6..7ffceedf02 100644
--- a/src/login/loginchrif.cpp
+++ b/src/login/loginchrif.cpp
@@ -3,8 +3,8 @@
 
 #include "loginchrif.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/showmsg.hpp> //show notice
 #include <common/socket.hpp> //wfifo session
diff --git a/src/login/loginclif.cpp b/src/login/loginclif.cpp
index 135f0e3c30..c01bf726e6 100644
--- a/src/login/loginclif.cpp
+++ b/src/login/loginclif.cpp
@@ -3,8 +3,8 @@
 
 #include "loginclif.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/malloc.hpp>
 #include <common/md5calc.hpp>
diff --git a/src/login/logincnslif.cpp b/src/login/logincnslif.cpp
index 8fbf444486..559ec78097 100644
--- a/src/login/logincnslif.cpp
+++ b/src/login/logincnslif.cpp
@@ -3,8 +3,8 @@
 
 #include "logincnslif.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/cli.hpp>
 #include <common/md5calc.hpp>
diff --git a/src/login/loginlog.cpp b/src/login/loginlog.cpp
index e91f79d9da..aaeab55d84 100644
--- a/src/login/loginlog.cpp
+++ b/src/login/loginlog.cpp
@@ -3,10 +3,9 @@
 
 #include "loginlog.hpp"
 
+#include <cstdlib> // exit
 #include <string>
 
-#include <stdlib.h> // exit
-
 #include <common/cbasetypes.hpp>
 #include <common/mmo.hpp>
 #include <common/showmsg.hpp>
diff --git a/src/map/achievement.cpp b/src/map/achievement.cpp
index 7412e94121..933ae0997b 100644
--- a/src/map/achievement.cpp
+++ b/src/map/achievement.cpp
@@ -4,10 +4,10 @@
 #include "achievement.hpp"
 
 #include <array>
-#include <setjmp.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <csetjmp>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/cbasetypes.hpp>
 #include <common/database.hpp>
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index bfe08a1867..fe9d780556 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -3,12 +3,11 @@
 
 #include "atcommand.hpp"
 
+#include <cmath>
+#include <cstdlib>
 #include <set>
 #include <unordered_map>
 
-#include <math.h>
-#include <stdlib.h>
-
 #include <common/cbasetypes.hpp>
 #include <common/database.hpp>
 #include <common/cli.hpp>
diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index 8794db3ada..79f0a058c4 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -3,8 +3,8 @@
 
 #include "battle.hpp"
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/ers.hpp>
diff --git a/src/map/buyingstore.cpp b/src/map/buyingstore.cpp
index a0a6c9e1f5..ab84dea1ac 100644
--- a/src/map/buyingstore.cpp
+++ b/src/map/buyingstore.cpp
@@ -3,7 +3,7 @@
 
 #include "buyingstore.hpp"  // struct s_buyingstore
 
-#include <stdlib.h> // atoi
+#include <cstdlib> // atoi
 
 #include <common/db.hpp>  // ARR_FIND
 #include <common/malloc.hpp> // aMalloc, aFree
diff --git a/src/map/cashshop.cpp b/src/map/cashshop.cpp
index 47aedbcfc2..ba587bc3e2 100644
--- a/src/map/cashshop.cpp
+++ b/src/map/cashshop.cpp
@@ -3,8 +3,8 @@
 
 #include "cashshop.hpp"
 
-#include <stdlib.h> // atoi
-#include <string.h> // memset
+#include <cstdlib> // atoi
+#include <cstring> // memset
 
 #include <common/cbasetypes.hpp> // uint16, uint32
 #include <common/malloc.hpp> // CREATE, RECREATE, aFree
diff --git a/src/map/channel.cpp b/src/map/channel.cpp
index 81fb71dcc4..359dd494cc 100644
--- a/src/map/channel.cpp
+++ b/src/map/channel.cpp
@@ -3,7 +3,7 @@
 
 #include "channel.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/conf.hpp> //libconfig
diff --git a/src/map/chrif.hpp b/src/map/chrif.hpp
index 1fb8ce3f4e..f7ee1d35d4 100644
--- a/src/map/chrif.hpp
+++ b/src/map/chrif.hpp
@@ -4,7 +4,7 @@
 #ifndef CHRIF_HPP
 #define CHRIF_HPP
 
-#include <time.h>
+#include <ctime>
 
 #include <common/cbasetypes.hpp>
 #include <common/mmo.hpp> // NAME_LENGTH
diff --git a/src/map/clan.cpp b/src/map/clan.cpp
index 02add781ca..0836da95ea 100644
--- a/src/map/clan.cpp
+++ b/src/map/clan.cpp
@@ -3,7 +3,7 @@
 
 #include "clan.hpp"
 
-#include <string.h> //memset
+#include <cstring> //memset
 
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index e1c06e28be..409352348c 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -4,13 +4,12 @@
 
 #include "clif.hpp"
 
-#include <unordered_set>
-
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <unordered_set>
 
 #include <common/cbasetypes.hpp>
 #include <common/conf.hpp>
diff --git a/src/map/clif.hpp b/src/map/clif.hpp
index 49362976d2..ca4f746b78 100644
--- a/src/map/clif.hpp
+++ b/src/map/clif.hpp
@@ -4,10 +4,9 @@
 #ifndef CLIF_HPP
 #define CLIF_HPP
 
+#include <cstdarg>
 #include <vector>
 
-#include <stdarg.h>
-
 #include <common/cbasetypes.hpp>
 #include <common/db.hpp> //dbmap
 #include <common/mmo.hpp>
diff --git a/src/map/date.cpp b/src/map/date.cpp
index c1ab3915c1..178a17af88 100644
--- a/src/map/date.cpp
+++ b/src/map/date.cpp
@@ -3,7 +3,7 @@
 
 #include "date.hpp"
 
-#include <time.h>
+#include <ctime>
 
 /*
  * Get the current year
diff --git a/src/map/duel.cpp b/src/map/duel.cpp
index 23c9fb5fe5..3afe90b903 100644
--- a/src/map/duel.cpp
+++ b/src/map/duel.cpp
@@ -3,8 +3,8 @@
 
 #include "duel.hpp"
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <unordered_map>
 
 #include <common/cbasetypes.hpp>
diff --git a/src/map/elemental.cpp b/src/map/elemental.cpp
index 25da5dc9ff..1aac296456 100644
--- a/src/map/elemental.cpp
+++ b/src/map/elemental.cpp
@@ -5,7 +5,7 @@
 
 #include <cstring>
 #include <cmath>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>
diff --git a/src/map/guild.cpp b/src/map/guild.cpp
index 373e5c03d5..aad2379ec1 100644
--- a/src/map/guild.cpp
+++ b/src/map/guild.cpp
@@ -3,7 +3,7 @@
 
 #include "guild.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory>
 
 #include <common/cbasetypes.hpp>
diff --git a/src/map/homunculus.cpp b/src/map/homunculus.cpp
index 8f2d70de81..144d452538 100644
--- a/src/map/homunculus.cpp
+++ b/src/map/homunculus.cpp
@@ -3,7 +3,7 @@
 
 #include "homunculus.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>
diff --git a/src/map/instance.cpp b/src/map/instance.cpp
index 24b35e43dd..e6e034abb9 100644
--- a/src/map/instance.cpp
+++ b/src/map/instance.cpp
@@ -3,8 +3,8 @@
 
 #include "instance.hpp"
 
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
 
 #include <common/cbasetypes.hpp>
 #include <common/db.hpp>
diff --git a/src/map/intif.cpp b/src/map/intif.cpp
index e5883f5fac..8fd15e0405 100644
--- a/src/map/intif.cpp
+++ b/src/map/intif.cpp
@@ -3,7 +3,7 @@
 
 #include "intif.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/malloc.hpp>
 #include <common/mmo.hpp>
diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp
index ff86c3de7c..d55c4a7af0 100644
--- a/src/map/itemdb.cpp
+++ b/src/map/itemdb.cpp
@@ -4,11 +4,11 @@
 #include "itemdb.hpp"
 
 #include <chrono>
+#include <cmath>
+#include <cstdlib>
 #include <fstream>
 #include <iostream>
 #include <map>
-#include <stdlib.h>
-#include <math.h>
 #include <unordered_map>
 
 #include <common/nullpo.hpp>
diff --git a/src/map/log.cpp b/src/map/log.cpp
index 1ca9c1d1c2..2c13785fe6 100644
--- a/src/map/log.cpp
+++ b/src/map/log.cpp
@@ -3,7 +3,7 @@
 
 #include "log.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/nullpo.hpp>
diff --git a/src/map/map.cpp b/src/map/map.cpp
index d2afef12cb..0f12974904 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -3,8 +3,8 @@
 
 #include "map.hpp"
 
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
 
 #include <config/core.hpp>
 
diff --git a/src/map/map.hpp b/src/map/map.hpp
index cea7c8b463..e9666520f0 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -5,7 +5,7 @@
 #define MAP_HPP
 
 #include <algorithm>
-#include <stdarg.h>
+#include <cstdarg>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/src/map/mapreg.cpp b/src/map/mapreg.cpp
index e20464d190..c79a91fa92 100644
--- a/src/map/mapreg.cpp
+++ b/src/map/mapreg.cpp
@@ -3,7 +3,7 @@
 
 #include "mapreg.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/db.hpp>
diff --git a/src/map/mercenary.cpp b/src/map/mercenary.cpp
index 7beb1cc11d..bdd6b1b035 100644
--- a/src/map/mercenary.cpp
+++ b/src/map/mercenary.cpp
@@ -3,9 +3,9 @@
 
 #include "mercenary.hpp"
 
+#include <cmath>
+#include <cstdlib>
 #include <map>
-#include <math.h>
-#include <stdlib.h>
 
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index 65f4042c9d..0ba2edfdb6 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -4,9 +4,9 @@
 #include "mob.hpp"
 
 #include <algorithm>
+#include <cmath>
+#include <cstdlib>
 #include <map>
-#include <math.h>
-#include <stdlib.h>
 #include <unordered_map>
 #include <vector>
 
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index ea97d4f9ed..3a2d18a01a 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -3,9 +3,9 @@
 
 #include "npc.hpp"
 
-#include <errno.h>
+#include <cerrno>
+#include <cstdlib>
 #include <map>
-#include <stdlib.h>
 #include <vector>
 
 #include <common/cbasetypes.hpp>
diff --git a/src/map/party.cpp b/src/map/party.cpp
index 9e3b6750ef..e59282e694 100644
--- a/src/map/party.cpp
+++ b/src/map/party.cpp
@@ -3,7 +3,7 @@
 
 #include "party.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>
diff --git a/src/map/party.hpp b/src/map/party.hpp
index e3fce03fdb..093f77e1f0 100644
--- a/src/map/party.hpp
+++ b/src/map/party.hpp
@@ -4,7 +4,7 @@
 #ifndef PARTY_HPP
 #define PARTY_HPP
 
-#include <stdarg.h>
+#include <cstdarg>
 
 #include <common/mmo.hpp> // struct party
 
diff --git a/src/map/path.cpp b/src/map/path.cpp
index 798b036476..4c1ce67ba3 100644
--- a/src/map/path.cpp
+++ b/src/map/path.cpp
@@ -3,10 +3,10 @@
 
 #include "path.hpp"
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/cbasetypes.hpp>
 #include <common/db.hpp>
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 7b183f79be..e11b97f986 100755
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -3,11 +3,10 @@
 
 #include "pc.hpp"
 
+#include <cmath>
+#include <cstdlib>
 #include <map>
 
-#include <math.h>
-#include <stdlib.h>
-
 #ifdef MAP_GENERATOR
 #include <fstream>
 #include <iostream>
diff --git a/src/map/pet.cpp b/src/map/pet.cpp
index 016f0ff472..fe58325018 100644
--- a/src/map/pet.cpp
+++ b/src/map/pet.cpp
@@ -3,11 +3,10 @@
 
 #include "pet.hpp"
 
+#include <cstdlib>
 #include <map>
 #include <string>
 
-#include <stdlib.h>
-
 #include <common/db.hpp>
 #include <common/ers.hpp>
 #include <common/malloc.hpp>
diff --git a/src/map/quest.cpp b/src/map/quest.cpp
index 4730c5a7cc..26fb580b8d 100644
--- a/src/map/quest.cpp
+++ b/src/map/quest.cpp
@@ -3,7 +3,7 @@
 
 #include "quest.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>
diff --git a/src/map/script.cpp b/src/map/script.cpp
index 692703029f..8fdc6fabc8 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -9,10 +9,10 @@
 
 #include "script.hpp"
 
-#include <errno.h>
-#include <math.h>
-#include <setjmp.h>
-#include <stdlib.h> // atoi, strtol, strtoll, exit
+#include <cerrno>
+#include <cmath>
+#include <csetjmp>
+#include <cstdlib> // atoi, strtol, strtoll, exit
 
 #ifdef PCRE_SUPPORT
 #include <pcre.h> // preg_match
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 57b1d026fb..b68fc26c1d 100755
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -4,11 +4,11 @@
 #include "skill.hpp"
 
 #include <array>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 #include <common/cbasetypes.hpp>
 #include <common/ers.hpp>
diff --git a/src/map/status.cpp b/src/map/status.cpp
index 420cb3b895..937ed5e8c6 100644
--- a/src/map/status.cpp
+++ b/src/map/status.cpp
@@ -3,9 +3,9 @@
 
 #include "status.hpp"
 
+#include <cmath>
+#include <cstdlib>
 #include <functional>
-#include <math.h>
-#include <stdlib.h>
 #include <string>
 
 #include <common/cbasetypes.hpp>
diff --git a/src/map/storage.cpp b/src/map/storage.cpp
index 5f59a26012..b7ecd2d643 100644
--- a/src/map/storage.cpp
+++ b/src/map/storage.cpp
@@ -3,11 +3,10 @@
 
 #include "storage.hpp"
 
+#include <cstdlib>
+#include <cstring>
 #include <map>
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <common/cbasetypes.hpp>
 #include <common/nullpo.hpp>
 #include <common/showmsg.hpp>
diff --git a/src/map/trade.cpp b/src/map/trade.cpp
index c766b674c9..1ad2e3a57c 100644
--- a/src/map/trade.cpp
+++ b/src/map/trade.cpp
@@ -3,8 +3,8 @@
 
 #include "trade.hpp"
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include <common/nullpo.hpp>
 #include <common/socket.hpp>
diff --git a/src/map/unit.cpp b/src/map/unit.cpp
index 562c928efb..3548bb3da1 100644
--- a/src/map/unit.cpp
+++ b/src/map/unit.cpp
@@ -3,8 +3,8 @@
 
 #include "unit.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <common/db.hpp>
 #include <common/ers.hpp>  // ers_destroy
diff --git a/src/map/vending.cpp b/src/map/vending.cpp
index 873d167171..8ff6914b4c 100755
--- a/src/map/vending.cpp
+++ b/src/map/vending.cpp
@@ -3,7 +3,7 @@
 
 #include "vending.hpp"
 
-#include <stdlib.h> // atoi
+#include <cstdlib> // atoi
 
 #include <common/malloc.hpp> // aMalloc, aFree
 #include <common/nullpo.hpp>
diff --git a/src/tool/csv2yaml.cpp b/src/tool/csv2yaml.cpp
index 89ac0892fb..c3e9cdb839 100644
--- a/src/tool/csv2yaml.cpp
+++ b/src/tool/csv2yaml.cpp
@@ -3,7 +3,7 @@
 
 #include "csv2yaml.hpp"
 
-#include <math.h>
+#include <cmath>
 
 using namespace rathena::tool_csv2yaml;
 
diff --git a/src/tool/mapcache.cpp b/src/tool/mapcache.cpp
index c588557599..4c78d3ba22 100644
--- a/src/tool/mapcache.cpp
+++ b/src/tool/mapcache.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <string>
 #ifndef _WIN32
 #include <unistd.h>
diff --git a/src/tool/yaml.hpp b/src/tool/yaml.hpp
index 6167cd67a1..54217a6abe 100644
--- a/src/tool/yaml.hpp
+++ b/src/tool/yaml.hpp
@@ -16,7 +16,7 @@
 #else
 	#include <termios.h>
 	#include <unistd.h>
-	#include <stdio.h>
+	#include <cstdio>
 #endif
 
 #include <yaml-cpp/yaml.h>
diff --git a/src/tool/yaml2sql.cpp b/src/tool/yaml2sql.cpp
index 1f9d518491..3f3ad2f50d 100644
--- a/src/tool/yaml2sql.cpp
+++ b/src/tool/yaml2sql.cpp
@@ -13,7 +13,7 @@
 #else
 	#include <termios.h>
 	#include <unistd.h>
-	#include <stdio.h>
+	#include <cstdio>
 #endif
 
 #include <yaml-cpp/yaml.h>
diff --git a/src/web/auth.cpp b/src/web/auth.cpp
index d54f25716d..09b148e23f 100644
--- a/src/web/auth.cpp
+++ b/src/web/auth.cpp
@@ -3,7 +3,7 @@
 
 #include "auth.hpp"
 
-#include <string.h>
+#include <cstring>
 
 #include <common/showmsg.hpp>
 #include <common/sql.hpp>
diff --git a/src/web/web.cpp b/src/web/web.cpp
index 35bd5c1fbc..008d8c3bbe 100644
--- a/src/web/web.cpp
+++ b/src/web/web.cpp
@@ -4,8 +4,8 @@
 #include "web.hpp"
 
 #include <chrono>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <string>
 #include <thread>