7 files changed, 5 insertions, 9 deletions
diff --git a/src/net/tmwa/beingrecv.h b/src/net/tmwa/beingrecv.h
index afb8e484b..0d7dd93ff 100644
--- a/src/net/tmwa/beingrecv.h
+++ b/src/net/tmwa/beingrecv.h
@@ -38,7 +38,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 class Being;
 
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 9fc0478c2..e9a7924b9 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/tmwa/charserverhandler.h"
 
-#include "client.h"
-
 #include "gui/windows/charcreatedialog.h"
 
 #include "net/character.h"
diff --git a/src/net/tmwa/chatrecv.h b/src/net/tmwa/chatrecv.h
index a46c0b8df..44758bbb2 100644
--- a/src/net/tmwa/chatrecv.h
+++ b/src/net/tmwa/chatrecv.h
@@ -28,7 +28,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/inventoryrecv.cpp b/src/net/tmwa/inventoryrecv.cpp
index 1586c5aa7..1bc89676a 100644
--- a/src/net/tmwa/inventoryrecv.cpp
+++ b/src/net/tmwa/inventoryrecv.cpp
@@ -72,7 +72,7 @@ namespace InventoryRecv
         EquipSlot::SHADOW_ACCESSORY2_SLOT,  // Shadow Accessory 2
         EquipSlot::SHADOW_ACCESSORY1_SLOT,  // Shadow Accessory 1
     };
-}
+}  // namespace InventoryRecv
 
 void InventoryRecv::processPlayerEquipment(Net::MessageIn &msg)
 {
diff --git a/src/net/tmwa/inventoryrecv.h b/src/net/tmwa/inventoryrecv.h
index 4408e00d3..102a6a871 100644
--- a/src/net/tmwa/inventoryrecv.h
+++ b/src/net/tmwa/inventoryrecv.h
@@ -28,7 +28,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index ad6ad5dce..d48c5123f 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/tmwa/loginhandler.h"
 
-#include "client.h"
-
 #include "net/serverfeatures.h"
 
 #include "net/ea/loginrecv.h"
diff --git a/src/net/tmwa/traderecv.h b/src/net/tmwa/traderecv.h
index 761164bf2..f8cd97609 100644
--- a/src/net/tmwa/traderecv.h
+++ b/src/net/tmwa/traderecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {