Switched most C headers to C++ (#8225)

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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

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>

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

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)

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"

src/common/db.hpp

@@ -42,10 +42,9 @@
 #ifndef DB_HPP
 #define DB_HPP
 
+#include <cstdarg>
 #include <utility>
 
-#include <stdarg.h>
-
 #include "cbasetypes.hpp"
 
 /*****************************************************************************\

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

src/common/grfio.cpp

@@ -3,7 +3,8 @@
 
 #include "grfio.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
+
 #include <zlib.h>
 
 #include "cbasetypes.hpp"

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)

src/common/mapindex.cpp

@@ -3,7 +3,7 @@
 
 #include "mapindex.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "core.hpp"
 #include "mmo.hpp"

src/common/md5calc.cpp

@@ -11,8 +11,8 @@
 
 #include "md5calc.hpp"
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "random.hpp"
 

src/common/mmo.hpp

@@ -4,7 +4,7 @@
 #ifndef MMO_HPP
 #define MMO_HPP
 
-#include <time.h>
+#include <ctime>
 
 #include <config/core.hpp>
 

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"

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"
 

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"

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>

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"

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"

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"
 

src/common/strlib.cpp

@@ -4,8 +4,7 @@
 #include "strlib.hpp"
 
 #include <algorithm>
-
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "cbasetypes.hpp"
 #include "malloc.hpp"

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);

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.

src/common/timer.hpp

@@ -4,7 +4,7 @@
 #ifndef TIMER_HPP
 #define TIMER_HPP
 
-#include <time.h>
+#include <ctime>
 
 #include "cbasetypes.hpp"
 

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"

src/common/utils.hpp

@@ -4,7 +4,7 @@
 #ifndef UTILS_HPP
 #define UTILS_HPP
 
-#include <stdio.h> // FILE*
+#include <cstdio> // FILE*
 
 #include "cbasetypes.hpp"
 

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>

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>

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>
 

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

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>

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>

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>

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>

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>

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>

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

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

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

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

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>

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>

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>

src/map/date.cpp

@@ -3,7 +3,7 @@
 
 #include "date.hpp"
 
-#include <time.h>
+#include <ctime>
 
 /*
  * Get the current year

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>

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>

src/map/guild.cpp

@@ -3,7 +3,7 @@
 
 #include "guild.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory>
 
 #include <common/cbasetypes.hpp>

src/map/homunculus.cpp

@@ -3,7 +3,7 @@
 
 #include "homunculus.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>

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>

src/map/intif.cpp

@@ -3,7 +3,7 @@
 
 #include "intif.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/malloc.hpp>
 #include <common/mmo.hpp>

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>

src/map/log.cpp

@@ -3,7 +3,7 @@
 
 #include "log.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/nullpo.hpp>

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>
 

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>

src/map/mapreg.cpp

@@ -3,7 +3,7 @@
 
 #include "mapreg.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/db.hpp>

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>

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>
 

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>

src/map/party.cpp

@@ -3,7 +3,7 @@
 
 #include "party.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>

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
 

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>

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>

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>

src/map/quest.cpp

@@ -3,7 +3,7 @@
 
 #include "quest.hpp"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <common/cbasetypes.hpp>
 #include <common/malloc.hpp>

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

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>

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>

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>

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>

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

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>

src/tool/csv2yaml.cpp

@@ -3,7 +3,7 @@
 
 #include "csv2yaml.hpp"
 
-#include <math.h>
+#include <cmath>
 
 using namespace rathena::tool_csv2yaml;
 

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>

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>

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>

src/web/auth.cpp

@@ -3,7 +3,7 @@
 
 #include "auth.hpp"
 
-#include <string.h>
+#include <cstring>
 
 #include <common/showmsg.hpp>
 #include <common/sql.hpp>

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>