15 files changed, 15 insertions, 17 deletions
diff --git a/src/net/eathena/battlegroundrecv.h b/src/net/eathena/battlegroundrecv.h
index 084061831..4349c532c 100644
--- a/src/net/eathena/battlegroundrecv.h
+++ b/src/net/eathena/battlegroundrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/beingrecv.h b/src/net/eathena/beingrecv.h
index d2d0a749e..416d7c894 100644
--- a/src/net/eathena/beingrecv.h
+++ b/src/net/eathena/beingrecv.h
@@ -42,7 +42,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 class Being;
 
diff --git a/src/net/eathena/buyingstorerecv.h b/src/net/eathena/buyingstorerecv.h
index 88a8ef7b7..ea0f76b00 100644
--- a/src/net/eathena/buyingstorerecv.h
+++ b/src/net/eathena/buyingstorerecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/charserverrecv.h b/src/net/eathena/charserverrecv.h
index 1935a888b..13b791d86 100644
--- a/src/net/eathena/charserverrecv.h
+++ b/src/net/eathena/charserverrecv.h
@@ -32,7 +32,7 @@ namespace Net
     class MessageIn;
 
     struct Character;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/chatrecv.h b/src/net/eathena/chatrecv.h
index d1845b0d3..d469bcbda 100644
--- a/src/net/eathena/chatrecv.h
+++ b/src/net/eathena/chatrecv.h
@@ -30,7 +30,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/inventoryrecv.cpp b/src/net/eathena/inventoryrecv.cpp
index f1d17a6ca..cc639e6e3 100644
--- a/src/net/eathena/inventoryrecv.cpp
+++ b/src/net/eathena/inventoryrecv.cpp
@@ -44,8 +44,6 @@
 #include "listeners/arrowslistener.h"
 
 #include "net/inventoryhandler.h"
-
-#include "net/inventoryhandler.h"
 #include "net/messagein.h"
 
 #include "net/eathena/itemflags.h"
@@ -97,7 +95,7 @@ namespace InventoryRecv
     };
 
     Ea::InventoryItems mCartItems;
-}
+}  // namespace InventoryRecv
 
 void InventoryRecv::processPlayerEquipment(Net::MessageIn &msg)
 {
diff --git a/src/net/eathena/inventoryrecv.h b/src/net/eathena/inventoryrecv.h
index 2050f2338..d024c8362 100644
--- a/src/net/eathena/inventoryrecv.h
+++ b/src/net/eathena/inventoryrecv.h
@@ -28,7 +28,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/mailrecv.h b/src/net/eathena/mailrecv.h
index 7ef41e8dd..3eabf7042 100644
--- a/src/net/eathena/mailrecv.h
+++ b/src/net/eathena/mailrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/npcrecv.h b/src/net/eathena/npcrecv.h
index 84f28b574..876d0f7dc 100644
--- a/src/net/eathena/npcrecv.h
+++ b/src/net/eathena/npcrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/partyrecv.h b/src/net/eathena/partyrecv.h
index ef188b9ff..9d7711ad8 100644
--- a/src/net/eathena/partyrecv.h
+++ b/src/net/eathena/partyrecv.h
@@ -25,7 +25,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/playerrecv.h b/src/net/eathena/playerrecv.h
index 8dfab5944..e6ef1f776 100644
--- a/src/net/eathena/playerrecv.h
+++ b/src/net/eathena/playerrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/skillrecv.h b/src/net/eathena/skillrecv.h
index c40e858e2..d40477ab5 100644
--- a/src/net/eathena/skillrecv.h
+++ b/src/net/eathena/skillrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/sp.h b/src/net/eathena/sp.h
index f3f1c7e1d..7a5e08181 100644
--- a/src/net/eathena/sp.h
+++ b/src/net/eathena/sp.h
@@ -268,4 +268,4 @@ namespace Sp
     };
 }  // namespace Sp
 
-#endif  // NET_EATHENA_H
+#endif  // NET_EATHENA_SP_H
diff --git a/src/net/eathena/traderecv.h b/src/net/eathena/traderecv.h
index 3e70b392d..39e8327bc 100644
--- a/src/net/eathena/traderecv.h
+++ b/src/net/eathena/traderecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/vendingrecv.h b/src/net/eathena/vendingrecv.h
index af7ddd382..edff20856 100644
--- a/src/net/eathena/vendingrecv.h
+++ b/src/net/eathena/vendingrecv.h
@@ -26,7 +26,7 @@ class BuyDialog;
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {