Fix code style.

11 files changed, 21 insertions, 12 deletions

diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp
index f0e9cbb15..512ef00d0 100644
--- a/src/actions/pets.cpp
+++ b/src/actions/pets.cpp
@@ -41,14 +41,13 @@
 #include "net/chathandler.h"
 #ifdef TMWA_SUPPORT
 #include "net/net.h"
-#else
-#include "utils/stringutils.h"
 #endif
 #include "net/pethandler.h"
 #include "net/serverfeatures.h"
 
 #include "utils/chatutils.h"
 #include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp
index 7137b468b..3f5149ef9 100644
--- a/src/net/eathena/messagein.cpp
+++ b/src/net/eathena/messagein.cpp
@@ -22,10 +22,12 @@
 
 #include "net/eathena/messagein.h"
 
+#include "logger.h"
+
 #include "net/net.h"
 #include "net/packetcounters.h"
 
-#include "logger.h"
+#include "utils/stringutils.h"
 
 #include <SDL_endian.h>
 
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index c5f0adad5..21736333c 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -108,7 +108,7 @@ Network::~Network()
 void Network::registerHandlers()
 {
 #include "net/eathena/recvpackets.inc"
-RECVPACKETS_VOID
+    RECVPACKETS_VOID
 }
 
 void Network::clearHandlers()
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index c2e96335f..7292b27ab 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -22,10 +22,12 @@
 
 #include "net/messageout.h"
 
+#include "logger.h"
+
 #include "net/net.h"
 #include "net/packetcounters.h"
 
-#include "logger.h"
+#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/net/net.h b/src/net/net.h
index 70dbbe1d5..4d84830b0 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -31,7 +31,9 @@
  * implementations depending on the type of server the client is connecting to.
  */
 
-#include "net/serverinfo.h"
+#include "enums/net/servertype.h"
+
+class ServerInfo;
 
 namespace Net
 {
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index 095ee91bf..ffea1ee4e 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -22,10 +22,12 @@
 
 #include "net/tmwa/messagein.h"
 
+#include "logger.h"
+
 #include "net/net.h"
 #include "net/packetcounters.h"
 
-#include "logger.h"
+#include "utils/stringutils.h"
 
 #include <SDL_endian.h>
 
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index bf574b567..12a5b1555 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -86,7 +86,7 @@ Network::~Network()
 void Network::registerHandlers()
 {
 #include "net/tmwa/recvpackets.inc"
-RECVPACKETS_VOID
+    RECVPACKETS_VOID
 }
 
 void Network::clearHandlers()
diff --git a/src/resources/db/itemfielddb.cpp b/src/resources/db/itemfielddb.cpp
index d7ea5e82a..9c9897c2f 100644
--- a/src/resources/db/itemfielddb.cpp
+++ b/src/resources/db/itemfielddb.cpp
@@ -28,6 +28,8 @@
 
 #include "resources/beingcommon.h"
 
+#include "resources/item/itemfieldtype.h"
+
 #include "debug.h"
 
 namespace
diff --git a/src/resources/db/itemfielddb.h b/src/resources/db/itemfielddb.h
index d2f63e9fe..18fa516b5 100644
--- a/src/resources/db/itemfielddb.h
+++ b/src/resources/db/itemfielddb.h
@@ -23,12 +23,12 @@
 
 #include "enums/simpletypes/skiperror.h"
 
-#include "resources/item/itemfieldtype.h"
-
 #include <map>
 
 #include "localconsts.h"
 
+struct ItemFieldType;
+
 namespace ItemFieldDb
 {
     void load();
diff --git a/src/resources/db/statuseffectdb.cpp b/src/resources/db/statuseffectdb.cpp
index 22916fb2e..a87c6fa1f 100644
--- a/src/resources/db/statuseffectdb.cpp
+++ b/src/resources/db/statuseffectdb.cpp
@@ -27,8 +27,6 @@
 #include "settings.h"
 #include "statuseffect.h"
 
-#include "listeners/debugmessagelistener.h"
-
 #include "utils/checkutils.h"
 
 #include "resources/beingcommon.h"
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 6274d285a..464e7ee80 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -56,6 +56,8 @@
 #include <unistd.h>
 #elif defined __native_client__
 #include "utils/naclmessages.h"
+#elif defined WIN32
+#include <SDL_syswm.h>
 #endif
 
 #endif  // USE_SDL2