Fix includes and update deheader ci script.

16 files changed, 6 insertions, 23 deletions

diff --git a/src/net/bankhandler.h b/src/net/bankhandler.h
index d6abfb5ed..5853e84c9 100644
--- a/src/net/bankhandler.h
+++ b/src/net/bankhandler.h
@@ -23,8 +23,6 @@
 
 #ifdef EATHENA_SUPPORT
 
-#include <string>
-
 #include "localconsts.h"
 
 namespace Net
diff --git a/src/net/cashshophandler.h b/src/net/cashshophandler.h
index 73bd6f399..2c4df7073 100644
--- a/src/net/cashshophandler.h
+++ b/src/net/cashshophandler.h
@@ -25,7 +25,6 @@
 
 #include "enums/simpletypes/itemcolor.h"
 
-#include <string>
 #include <vector>
 
 #include "localconsts.h"
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 91d448899..69acb6895 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -23,6 +23,7 @@
 
 #include "configuration.h"
 #include "logger.h"
+#include "main.h"
 #include "settings.h"
 
 #include "utils/files.h"
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 6b3b85073..2adb35d12 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -25,8 +25,6 @@
 
 #include "net/playerhandler.h"
 
-#include <climits>
-
 namespace Ea
 {
 
diff --git a/src/net/ea/playerrecv.h b/src/net/ea/playerrecv.h
index e87a04ff9..f1a369f93 100644
--- a/src/net/ea/playerrecv.h
+++ b/src/net/ea/playerrecv.h
@@ -23,8 +23,6 @@
 #ifndef NET_EA_PLAYERRECV_H
 #define NET_EA_PLAYERRECV_H
 
-#include <climits>
-
 namespace Net
 {
     class MessageIn;
diff --git a/src/net/eathena/protocolout.h b/src/net/eathena/protocolout.h
index fa8319c92..a6ca11a78 100644
--- a/src/net/eathena/protocolout.h
+++ b/src/net/eathena/protocolout.h
@@ -28,11 +28,13 @@
 namespace EAthena
 {
 #include "net/eathena/packetsout.inc"
+PACKETSOUT_VOID
 }  // namespace EAthena
 
 #undef packet
 #undef packet2
 #undef startCondition
 #undef endCondition
+#undef PACKETSOUT_VOID
 
 #endif  // NET_EATHENA_PROTOCOLOUT_H
diff --git a/src/net/eathena/updateprotocol.cpp b/src/net/eathena/updateprotocol.cpp
index a23ea51bb..2e7dc8cb9 100644
--- a/src/net/eathena/updateprotocol.cpp
+++ b/src/net/eathena/updateprotocol.cpp
@@ -30,8 +30,6 @@
 extern int packetVersion;
 extern int serverVersion;
 
-PACKETSOUT_VOID
-#undef PACKETSOUT_VOID
 namespace EAthena
 {
 
diff --git a/src/net/elementalhandler.h b/src/net/elementalhandler.h
index 5c506e4c0..93558830d 100644
--- a/src/net/elementalhandler.h
+++ b/src/net/elementalhandler.h
@@ -23,8 +23,6 @@
 
 #ifdef EATHENA_SUPPORT
 
-#include <string>
-
 #include "localconsts.h"
 
 namespace Net
diff --git a/src/net/familyhandler.h b/src/net/familyhandler.h
index e7e47be3b..32ef030b4 100644
--- a/src/net/familyhandler.h
+++ b/src/net/familyhandler.h
@@ -23,8 +23,6 @@
 
 #ifdef EATHENA_SUPPORT
 
-#include <string>
-
 #include "localconsts.h"
 
 class Being;
diff --git a/src/net/maphandler.h b/src/net/maphandler.h
index 7d7b82949..61d47bf82 100644
--- a/src/net/maphandler.h
+++ b/src/net/maphandler.h
@@ -23,8 +23,6 @@
 
 #ifdef EATHENA_SUPPORT
 
-#include <string>
-
 #include "localconsts.h"
 
 namespace Net
diff --git a/src/net/markethandler.h b/src/net/markethandler.h
index f571237a8..4ebbb6e61 100644
--- a/src/net/markethandler.h
+++ b/src/net/markethandler.h
@@ -27,7 +27,6 @@
 
 #include "enums/simpletypes/itemcolor.h"
 
-#include <string>
 #include <vector>
 
 #include "localconsts.h"
diff --git a/src/net/roulettehandler.h b/src/net/roulettehandler.h
index 4cd43eabb..66bda0b1d 100644
--- a/src/net/roulettehandler.h
+++ b/src/net/roulettehandler.h
@@ -23,8 +23,6 @@
 
 #ifdef EATHENA_SUPPORT
 
-#include <string>
-
 #include "localconsts.h"
 
 namespace Net
diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h
index 94855485d..37b78e146 100644
--- a/src/net/sdltcpnet.h
+++ b/src/net/sdltcpnet.h
@@ -26,6 +26,7 @@
 #pragma GCC diagnostic ignored "-Wswitch-default"
 #endif
 #include <SDL_stdinc.h>
+_SDL_stdinc_h
 #ifdef USE_SDL2
 #pragma GCC diagnostic pop
 #endif
diff --git a/src/net/searchstorehandler.h b/src/net/searchstorehandler.h
index 5c01f22c2..1b903793d 100644
--- a/src/net/searchstorehandler.h
+++ b/src/net/searchstorehandler.h
@@ -23,8 +23,6 @@
 
 #ifdef EATHENA_SUPPORT
 
-#include <string>
-
 #include "enums/net/storesearchtype.h"
 
 #include "localconsts.h"
diff --git a/src/net/tmwa/protocolout.h b/src/net/tmwa/protocolout.h
index 2686cd9f5..037d70f7b 100644
--- a/src/net/tmwa/protocolout.h
+++ b/src/net/tmwa/protocolout.h
@@ -28,11 +28,13 @@
 namespace TmwAthena
 {
 #include "net/tmwa/packetsout.inc"
+PACKETSOUT_VOID
 }  // namespace TmwAthena
 
 #undef packet
 #undef packet2
 #undef startCondition
 #undef endCondition
+#undef PACKETSOUT_VOID
 
 #endif  // NET_TMWA_PROTOCOLOUT_H
diff --git a/src/net/tmwa/updateprotocol.cpp b/src/net/tmwa/updateprotocol.cpp
index 7d5622acd..b7aeae2d8 100644
--- a/src/net/tmwa/updateprotocol.cpp
+++ b/src/net/tmwa/updateprotocol.cpp
@@ -25,9 +25,6 @@
 
 #include "debug.h"
 
-PACKETSOUT_VOID
-#undef PACKETSOUT_VOID
-
 namespace TmwAthena
 {