Fix namespace comments.

85 files changed, 89 insertions, 89 deletions

diff --git a/src/being/beingspeech.h b/src/being/beingspeech.h
index c8b01618a..869d1b665 100644
--- a/src/being/beingspeech.h
+++ b/src/being/beingspeech.h
@@ -32,6 +32,6 @@ namespace BeingSpeech
         NO_NAME_IN_BUBBLE,
         NAME_IN_BUBBLE
     };
-}  // BeingSpeech
+}  // namespace BeingSpeech
 
 #endif  // BEING_BEINGSPEECH_H
diff --git a/src/enums/being/visiblename.h b/src/enums/being/visiblename.h
index e02fa878b..ec7ec3271 100644
--- a/src/enums/being/visiblename.h
+++ b/src/enums/being/visiblename.h
@@ -29,6 +29,6 @@ namespace VisibleName
         Show            = 1,
         ShowOnSelection = 2
     };
-}  // namespace BeingDirection
+}  // namespace VisibleName
 
 #endif  // ENUMS_BEING_VISIBLENAME_H
diff --git a/src/enums/gui/colorname.h b/src/enums/gui/colorname.h
index 41636e62e..3e45fcb66 100644
--- a/src/enums/gui/colorname.h
+++ b/src/enums/gui/colorname.h
@@ -40,6 +40,6 @@ namespace ColorName
         BROWN,
         COLORS_MAX
     };
-}
+}  // namespace ColorName
 
 #endif  // ENUMS_GUI_COLORNAME_H
diff --git a/src/enums/gui/linkhighlightmode.h b/src/enums/gui/linkhighlightmode.h
index a79625b72..04e14c947 100644
--- a/src/enums/gui/linkhighlightmode.h
+++ b/src/enums/gui/linkhighlightmode.h
@@ -37,6 +37,6 @@ namespace LinkHighlightMode
         UNDERLINE  = 1,
         BACKGROUND = 2
     };
-}
+}  // namespace LinkHighlightMode
 
 #endif  // ENUMS_GUI_LINKHIGHLIGHTMODE_H
diff --git a/src/enums/gui/slidergrid.h b/src/enums/gui/slidergrid.h
index bc9a634dd..790fa5878 100644
--- a/src/enums/gui/slidergrid.h
+++ b/src/enums/gui/slidergrid.h
@@ -80,6 +80,6 @@ namespace SliderGrid
         VGRIP,
         SLIDER_MAX
     };
-}  // SliderGrid
+}  // namespace SliderGrid
 
 #endif  // ENUMS_GUI_SLIDERGRID_H
diff --git a/src/enums/guildpositionflags.h b/src/enums/guildpositionflags.h
index 9f9578a56..180545103 100644
--- a/src/enums/guildpositionflags.h
+++ b/src/enums/guildpositionflags.h
@@ -33,6 +33,6 @@ namespace GuildPositionFlags
         Invite  = 0x01,
         Expel   = 0x10
     };
-}
+}  // namespace GuildPositionFlags
 
 #endif  // ENUMS_GUILDPOSITIONFLAGS_H
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index e2ae38038..def986b2d 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -36,7 +36,7 @@ class Label;
 namespace Net
 {
     struct Character;
-}
+}  // namespace Net
 
 class CharacterDisplay final : public Container,
                                public MouseListener,
diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h
index 27f2111b2..23d0d22cd 100644
--- a/src/gui/windows/charselectdialog.h
+++ b/src/gui/windows/charselectdialog.h
@@ -41,7 +41,7 @@ class TextDialog;
 namespace Net
 {
     class CharServerHandler;
-}
+}  // namespace Net
 
 /**
  * Character selection dialog.
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index 6ae2d8925..71c74f62e 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -46,7 +46,7 @@ class ServersListModel;
 namespace Net
 {
     class Download;
-}
+}  // namespace Net
 
 /**
  * The server choice dialog.
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index e95827422..56d72b197 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -49,7 +49,7 @@ class ScrollArea;
 namespace Net
 {
     class Download;
-}
+}  // namespace Net
 
 /**
  * Update progress window GUI
diff --git a/src/net/ea/adminrecv.h b/src/net/ea/adminrecv.h
index 2f01eaa24..71451aa21 100644
--- a/src/net/ea/adminrecv.h
+++ b/src/net/ea/adminrecv.h
@@ -28,14 +28,14 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace Ea
 {
     namespace AdminRecv
     {
         void processKickAck(Net::MessageIn &msg);
-    }  // namespace Admin
+    }  // namespace AdminRecv
 }  // namespace Ea
 
 #endif  // NET_EA_ADMINRECV_H
diff --git a/src/net/ea/buysellrecv.cpp b/src/net/ea/buysellrecv.cpp
index 09109a540..95f69129f 100644
--- a/src/net/ea/buysellrecv.cpp
+++ b/src/net/ea/buysellrecv.cpp
@@ -50,7 +50,7 @@ namespace BuySellRecv
 {
     BeingId mNpcId = BeingId_zero;
     BuyDialog *mBuyDialog = nullptr;
-}
+}  // namespace BuySellRecv
 
 void BuySellRecv::processNpcBuySellChoice(Net::MessageIn &msg)
 {
diff --git a/src/net/ea/buysellrecv.h b/src/net/ea/buysellrecv.h
index 6f32c7dc4..7d70044fe 100644
--- a/src/net/ea/buysellrecv.h
+++ b/src/net/ea/buysellrecv.h
@@ -28,7 +28,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 class BuyDialog;
 
diff --git a/src/net/ea/charserverrecv.h b/src/net/ea/charserverrecv.h
index 9459c4bb3..5e105210c 100644
--- a/src/net/ea/charserverrecv.h
+++ b/src/net/ea/charserverrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace Ea
 {
diff --git a/src/net/ea/gamerecv.h b/src/net/ea/gamerecv.h
index c334364fa..f0c5d8f41 100644
--- a/src/net/ea/gamerecv.h
+++ b/src/net/ea/gamerecv.h
@@ -30,7 +30,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace Ea
 {
diff --git a/src/net/ea/itemrecv.h b/src/net/ea/itemrecv.h
index a69c038c4..5e159b791 100644
--- a/src/net/ea/itemrecv.h
+++ b/src/net/ea/itemrecv.h
@@ -28,7 +28,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace Ea
 {
diff --git a/src/net/ea/maprecv.h b/src/net/ea/maprecv.h
index c4b5077f8..48c19d158 100644
--- a/src/net/ea/maprecv.h
+++ b/src/net/ea/maprecv.h
@@ -34,7 +34,7 @@ namespace Ea
     namespace MapRecv
     {
         void processSetTilesType(Net::MessageIn &msg);
-    }  // namespace PartyRecv
+    }  // namespace MapRecv
 }  // namespace Ea
 
 #endif  // NET_EA_MAPRECV_H
diff --git a/src/net/ea/skillrecv.h b/src/net/ea/skillrecv.h
index 728858c70..de4fe1112 100644
--- a/src/net/ea/skillrecv.h
+++ b/src/net/ea/skillrecv.h
@@ -28,7 +28,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace Ea
 {
diff --git a/src/net/ea/traderecv.h b/src/net/ea/traderecv.h
index ab48b7d4e..ce8176bf3 100644
--- a/src/net/ea/traderecv.h
+++ b/src/net/ea/traderecv.h
@@ -36,7 +36,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace Ea
 {
diff --git a/src/net/eathena/adminrecv.h b/src/net/eathena/adminrecv.h
index d23d9e966..36453de0f 100644
--- a/src/net/eathena/adminrecv.h
+++ b/src/net/eathena/adminrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
@@ -33,7 +33,7 @@ namespace EAthena
         void processAdminGetLoginAck(Net::MessageIn &msg);
         void processSetTileType(Net::MessageIn &msg);
         void processAccountStats(Net::MessageIn &msg);
-    }  // namespace Admin
+    }  // namespace AdminRecv
 }  // namespace EAthena
 
 #endif  // NET_EATHENA_ADMINRECV_H
diff --git a/src/net/eathena/auctionrecv.h b/src/net/eathena/auctionrecv.h
index 2cd7b5a67..25e91a848 100644
--- a/src/net/eathena/auctionrecv.h
+++ b/src/net/eathena/auctionrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
@@ -35,7 +35,7 @@ namespace EAthena
         void processAuctionSetItem(Net::MessageIn &msg);
         void processAuctionMessage(Net::MessageIn &msg);
         void processAuctionClose(Net::MessageIn &msg);
-    }  // namespace Admin
+    }  // namespace AuctionRecv
 }  // namespace EAthena
 
 #endif  // NET_EATHENA_AUCTIONRECV_H
diff --git a/src/net/eathena/bankrecv.h b/src/net/eathena/bankrecv.h
index e75a3c168..2d2755170 100644
--- a/src/net/eathena/bankrecv.h
+++ b/src/net/eathena/bankrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/buysellrecv.h b/src/net/eathena/buysellrecv.h
index f3158948e..445fe35c6 100644
--- a/src/net/eathena/buysellrecv.h
+++ b/src/net/eathena/buysellrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/cashshoprecv.cpp b/src/net/eathena/cashshoprecv.cpp
index 796d2a211..421631ab6 100644
--- a/src/net/eathena/cashshoprecv.cpp
+++ b/src/net/eathena/cashshoprecv.cpp
@@ -48,7 +48,7 @@ namespace EAthena
 namespace CashShopRecv
 {
     BuyDialog *mBuyDialog;
-}
+}  // namespace CashShopRecv
 
 void CashShopRecv::processCashShopOpen(Net::MessageIn &msg)
 {
diff --git a/src/net/eathena/cashshoprecv.h b/src/net/eathena/cashshoprecv.h
index 00053733e..619474a6c 100644
--- a/src/net/eathena/cashshoprecv.h
+++ b/src/net/eathena/cashshoprecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 class BuyDialog;
 
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index fbeaf7f29..ab6e12ae7 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -71,7 +71,7 @@ namespace CharServerRecv
     BeingId mPinAccountId = BeingId_zero;
     BeingId mRenameId = BeingId_zero;
     bool mNeedCreatePin = false;
-}
+}  // namespace CharServerRecv
 
 // callers must count each packet size by self
 void CharServerRecv::readPlayerData(Net::MessageIn &msg,
diff --git a/src/net/eathena/chatrecv.cpp b/src/net/eathena/chatrecv.cpp
index 1aee777e9..4c6fea1d7 100644
--- a/src/net/eathena/chatrecv.cpp
+++ b/src/net/eathena/chatrecv.cpp
@@ -56,7 +56,7 @@ namespace EAthena
 namespace ChatRecv
 {
     std::string mChatRoom;
-}
+}  // namespace ChatRecv
 
 void ChatRecv::processIgnoreNickAck(Net::MessageIn &msg)
 {
diff --git a/src/net/eathena/elementalrecv.h b/src/net/eathena/elementalrecv.h
index e521b533c..f99c8e1a3 100644
--- a/src/net/eathena/elementalrecv.h
+++ b/src/net/eathena/elementalrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/familyrecv.h b/src/net/eathena/familyrecv.h
index 43e81349c..f069851aa 100644
--- a/src/net/eathena/familyrecv.h
+++ b/src/net/eathena/familyrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/friendsrecv.h b/src/net/eathena/friendsrecv.h
index 0ebabd2f4..c6dbb5841 100644
--- a/src/net/eathena/friendsrecv.h
+++ b/src/net/eathena/friendsrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/gamerecv.h b/src/net/eathena/gamerecv.h
index 7fca3ba2b..3d2dbe590 100644
--- a/src/net/eathena/gamerecv.h
+++ b/src/net/eathena/gamerecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/generalrecv.h b/src/net/eathena/generalrecv.h
index 0fb20d080..fa5088c3d 100644
--- a/src/net/eathena/generalrecv.h
+++ b/src/net/eathena/generalrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/guildrecv.h b/src/net/eathena/guildrecv.h
index 99881d4dd..f449480bf 100644
--- a/src/net/eathena/guildrecv.h
+++ b/src/net/eathena/guildrecv.h
@@ -27,7 +27,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 class Guild;
 class GuildTab;
diff --git a/src/net/eathena/homunculusrecv.h b/src/net/eathena/homunculusrecv.h
index a7cea9b37..d53a6fcda 100644
--- a/src/net/eathena/homunculusrecv.h
+++ b/src/net/eathena/homunculusrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/itemrecv.h b/src/net/eathena/itemrecv.h
index bc07c16d0..d4eb2df34 100644
--- a/src/net/eathena/itemrecv.h
+++ b/src/net/eathena/itemrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/loginrecv.h b/src/net/eathena/loginrecv.h
index 2e070d584..ca2da52bf 100644
--- a/src/net/eathena/loginrecv.h
+++ b/src/net/eathena/loginrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/maphandler.h b/src/net/eathena/maphandler.h
index 40a8cfe82..432039209 100644
--- a/src/net/eathena/maphandler.h
+++ b/src/net/eathena/maphandler.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/maprecv.h b/src/net/eathena/maprecv.h
index d0aa6af41..d9fffc8a2 100644
--- a/src/net/eathena/maprecv.h
+++ b/src/net/eathena/maprecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/marketrecv.h b/src/net/eathena/marketrecv.h
index bb4f2a58a..a75491967 100644
--- a/src/net/eathena/marketrecv.h
+++ b/src/net/eathena/marketrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 class BuyDialog;
 
diff --git a/src/net/eathena/mercenaryrecv.h b/src/net/eathena/mercenaryrecv.h
index 2db94b9da..a18314bcd 100644
--- a/src/net/eathena/mercenaryrecv.h
+++ b/src/net/eathena/mercenaryrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/petrecv.h b/src/net/eathena/petrecv.h
index a97748cca..a520ca107 100644
--- a/src/net/eathena/petrecv.h
+++ b/src/net/eathena/petrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/questrecv.h b/src/net/eathena/questrecv.h
index 491bbb3cf..aff969a59 100644
--- a/src/net/eathena/questrecv.h
+++ b/src/net/eathena/questrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/rouletterecv.h b/src/net/eathena/rouletterecv.h
index 08f5ec0dd..e922a8b02 100644
--- a/src/net/eathena/rouletterecv.h
+++ b/src/net/eathena/rouletterecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/eathena/searchstorerecv.h b/src/net/eathena/searchstorerecv.h
index 3ec3d66f7..916c26ad2 100644
--- a/src/net/eathena/searchstorerecv.h
+++ b/src/net/eathena/searchstorerecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace EAthena
 {
diff --git a/src/net/packetfunction.h b/src/net/packetfunction.h
index 31d4d6fe5..832545ca3 100644
--- a/src/net/packetfunction.h
+++ b/src/net/packetfunction.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 typedef void (*PacketFuncPtr) (Net::MessageIn &msg);
 
diff --git a/src/net/packetlimiter.h b/src/net/packetlimiter.h
index eb4fee32e..ec8aa7b79 100644
--- a/src/net/packetlimiter.h
+++ b/src/net/packetlimiter.h
@@ -36,6 +36,6 @@ namespace PacketLimiter
     bool limitPackets(const PacketTypeT type) A_WARN_UNUSED;
 
     bool checkPackets(const PacketTypeT type) A_WARN_UNUSED;
-}
+}  // namespace PacketLimiter
 
 #endif  // NET_PACKETLIMITER_H
diff --git a/src/net/tmwa/buysellrecv.h b/src/net/tmwa/buysellrecv.h
index 36607df84..fc1613b5d 100644
--- a/src/net/tmwa/buysellrecv.h
+++ b/src/net/tmwa/buysellrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/charserverrecv.h b/src/net/tmwa/charserverrecv.h
index aefbf1e16..195c5239c 100644
--- a/src/net/tmwa/charserverrecv.h
+++ b/src/net/tmwa/charserverrecv.h
@@ -28,7 +28,7 @@ namespace Net
     class MessageIn;
 
     struct Character;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/gamerecv.h b/src/net/tmwa/gamerecv.h
index 15c1fe863..eca251fd2 100644
--- a/src/net/tmwa/gamerecv.h
+++ b/src/net/tmwa/gamerecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/generalrecv.h b/src/net/tmwa/generalrecv.h
index 444b8784d..92f0e71f8 100644
--- a/src/net/tmwa/generalrecv.h
+++ b/src/net/tmwa/generalrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/itemrecv.h b/src/net/tmwa/itemrecv.h
index d3d2ff177..8fc24b579 100644
--- a/src/net/tmwa/itemrecv.h
+++ b/src/net/tmwa/itemrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/loginrecv.h b/src/net/tmwa/loginrecv.h
index d9bae56dc..fb038da55 100644
--- a/src/net/tmwa/loginrecv.h
+++ b/src/net/tmwa/loginrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/partyrecv.h b/src/net/tmwa/partyrecv.h
index 7cbf8d760..8665df3e8 100644
--- a/src/net/tmwa/partyrecv.h
+++ b/src/net/tmwa/partyrecv.h
@@ -25,7 +25,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/playerrecv.h b/src/net/tmwa/playerrecv.h
index 021754f44..626114640 100644
--- a/src/net/tmwa/playerrecv.h
+++ b/src/net/tmwa/playerrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/protocolout.cpp b/src/net/tmwa/protocolout.cpp
index fc3a8942b..38cee1227 100644
--- a/src/net/tmwa/protocolout.cpp
+++ b/src/net/tmwa/protocolout.cpp
@@ -25,6 +25,6 @@ namespace TmwAthena
 #undef packet
 PROTOCOLOUT_VOID
 PACKETSOUT_VOID
-}  // namesspace TmwAthena
+}  // namespace TmwAthena
 
 #include "debug.h"
diff --git a/src/net/tmwa/questrecv.h b/src/net/tmwa/questrecv.h
index 24d7ea25a..3e9d958ea 100644
--- a/src/net/tmwa/questrecv.h
+++ b/src/net/tmwa/questrecv.h
@@ -24,7 +24,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/skillrecv.h b/src/net/tmwa/skillrecv.h
index 727a32698..f63d883c2 100644
--- a/src/net/tmwa/skillrecv.h
+++ b/src/net/tmwa/skillrecv.h
@@ -26,7 +26,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace TmwAthena
 {
diff --git a/src/net/uploadcharinfo.h b/src/net/uploadcharinfo.h
index 3058bc989..7a11de0a8 100644
--- a/src/net/uploadcharinfo.h
+++ b/src/net/uploadcharinfo.h
@@ -30,7 +30,7 @@ class ChatTab;
 namespace Net
 {
     class Download;
-}
+}  // namespace Net
 
 struct UploadChatInfo final
 {
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 0b1b0e7b4..6b359cec1 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -41,7 +41,7 @@ struct Attack;
 namespace ColorDB
 {
     class ItemColorData;
-}
+}  // namespace ColorDB
 
 typedef std::map<int, Attack*> Attacks;
 
diff --git a/src/resources/cursors.h b/src/resources/cursors.h
index 4dfeab87c..bf233fc0e 100644
--- a/src/resources/cursors.h
+++ b/src/resources/cursors.h
@@ -38,6 +38,6 @@ namespace Cursors
     };
 
     CursorT stringToCursor(const std::string &name) A_WARN_UNUSED;
-}  // namespace Cursor
+}  // namespace Cursors
 
 #endif  // RESOURCES_CURSOR_H
diff --git a/src/resources/db/avatardb.cpp b/src/resources/db/avatardb.cpp
index 86c2ff5aa..a3abf5fec 100644
--- a/src/resources/db/avatardb.cpp
+++ b/src/resources/db/avatardb.cpp
@@ -40,7 +40,7 @@ namespace
 {
     BeingInfos mAvatarInfos;
     bool mLoaded = false;
-}
+}  // namespace
 
 void AvatarDB::load()
 {
diff --git a/src/resources/db/badgesdb.cpp b/src/resources/db/badgesdb.cpp
index 4b6bd85d2..48034e3a3 100644
--- a/src/resources/db/badgesdb.cpp
+++ b/src/resources/db/badgesdb.cpp
@@ -34,7 +34,7 @@ namespace
     BadgesInfos mNames;
     BadgesInfos mParties;
     bool mLoaded = false;
-}
+}  // namespace
 
 static void loadXmlFile(const std::string &file,
                         const std::string &name,
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp
index 15e66bb5b..088bb8832 100644
--- a/src/resources/db/colordb.cpp
+++ b/src/resources/db/colordb.cpp
@@ -35,7 +35,7 @@ namespace
     bool mLoaded = false;
     std::string mFail("#ffffff");
     ColorDB::ColorLists mColorLists;
-}
+}  // namespace
 
 void ColorDB::load()
 {
diff --git a/src/resources/db/commandsdb.cpp b/src/resources/db/commandsdb.cpp
index eec3eb7ce..0f3046047 100644
--- a/src/resources/db/commandsdb.cpp
+++ b/src/resources/db/commandsdb.cpp
@@ -34,7 +34,7 @@ namespace
 {
     CommandsMap mCommands;
     bool mLoaded = false;
-}
+}  // namespace
 
 void CommandsDB::load()
 {
diff --git a/src/resources/db/elementaldb.cpp b/src/resources/db/elementaldb.cpp
index 8701081a3..9624366f6 100644
--- a/src/resources/db/elementaldb.cpp
+++ b/src/resources/db/elementaldb.cpp
@@ -36,7 +36,7 @@ namespace
 {
     BeingInfos mElementalInfos;
     bool mLoaded = false;
-}
+}  // namespace
 
 void ElementalDb::load()
 {
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index 085f81abe..72b7f0092 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -42,7 +42,7 @@ namespace
     EmoteInfo mUnknown;
     bool mLoaded = false;
     int mLastEmote = 0;
-}
+}  // namespace
 
 void EmoteDB::load()
 {
diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp
index 3fdced887..bedc7c319 100644
--- a/src/resources/db/homunculusdb.cpp
+++ b/src/resources/db/homunculusdb.cpp
@@ -37,7 +37,7 @@ namespace
 {
     BeingInfos mHomunculusInfos;
     bool mLoaded = false;
-}
+}  // namespace
 
 void HomunculusDB::load()
 {
diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp
index 961fbca32..c9f363246 100644
--- a/src/resources/db/horsedb.cpp
+++ b/src/resources/db/horsedb.cpp
@@ -38,7 +38,7 @@ namespace
     HorseInfos mHorseInfos;
     HorseInfo mUnknown;
     bool mLoaded = false;
-}
+}  // namespace
 
 #define loadSprite(name) \
     { \
diff --git a/src/resources/db/languagedb.h b/src/resources/db/languagedb.h
index 8f33576a6..6b73d455e 100644
--- a/src/resources/db/languagedb.h
+++ b/src/resources/db/languagedb.h
@@ -39,6 +39,6 @@ namespace LanguageDb
     const std::string &getIcon(const int id);
 
     const std::string &getPo(const int id);
-}  // namespace LanguageDB
+}  // namespace LanguageDb
 
 #endif  // RESOURCES_DB_LANGUAGEDB_H
diff --git a/src/resources/db/mapdb.cpp b/src/resources/db/mapdb.cpp
index e96f31e52..7ae90815e 100644
--- a/src/resources/db/mapdb.cpp
+++ b/src/resources/db/mapdb.cpp
@@ -34,13 +34,13 @@ namespace
     MapDB::Maps mMaps;
     MapDB::MapInfos mInfos;
     MapDB::Atlases mAtlases;
-}
+}  // namespace
 
 namespace MapDB
 {
     void readMap(XmlNodePtrConst node);
     void readAtlas(XmlNodePtrConst node);
-}
+}  // namespace MapDB
 
 void MapDB::load()
 {
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index a528c7def..ca1b950f9 100644
--- a/src/resources/db/mercenarydb.cpp
+++ b/src/resources/db/mercenarydb.cpp
@@ -37,7 +37,7 @@ namespace
 {
     BeingInfos mMercenaryInfos;
     bool mLoaded = false;
-}
+}  // namespace
 
 void MercenaryDB::load()
 {
diff --git a/src/resources/db/moddb.cpp b/src/resources/db/moddb.cpp
index 5932d9b19..9f69c9891 100644
--- a/src/resources/db/moddb.cpp
+++ b/src/resources/db/moddb.cpp
@@ -36,7 +36,7 @@ namespace
 {
     ModInfos mModInfos;
     bool mLoaded = false;
-}
+}  // namespace
 
 void ModDB::load()
 {
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 44b430144..a8a040973 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -41,7 +41,7 @@ namespace
 {
     BeingInfos mMonsterInfos;
     bool mLoaded = false;
-}
+}  // namespace
 
 void MonsterDB::load()
 {
diff --git a/src/resources/db/npcdb.cpp b/src/resources/db/npcdb.cpp
index 44a0bc747..08038d796 100644
--- a/src/resources/db/npcdb.cpp
+++ b/src/resources/db/npcdb.cpp
@@ -41,7 +41,7 @@ namespace
 {
     BeingInfos mNPCInfos;
     bool mLoaded = false;
-}
+}  // namespace
 
 void NPCDB::load()
 {
diff --git a/src/resources/db/npcdialogdb.cpp b/src/resources/db/npcdialogdb.cpp
index 7411faca9..0e4ab5ffc 100644
--- a/src/resources/db/npcdialogdb.cpp
+++ b/src/resources/db/npcdialogdb.cpp
@@ -34,7 +34,7 @@ namespace
 {
     bool mLoaded = false;
     NpcDialogDB::Dialogs mDialogs;
-}
+}  // namespace
 
 void NpcDialogDB::load()
 {
diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp
index f6f54a875..0390550d4 100644
--- a/src/resources/db/palettedb.cpp
+++ b/src/resources/db/palettedb.cpp
@@ -34,7 +34,7 @@ namespace
 {
     bool mLoaded = false;
     std::map<std::string, DyeColor> mColors;
-}
+}  // namespace
 
 void PaletteDB::load()
 {
diff --git a/src/resources/db/petdb.cpp b/src/resources/db/petdb.cpp
index a47956e7f..ccfaecda9 100644
--- a/src/resources/db/petdb.cpp
+++ b/src/resources/db/petdb.cpp
@@ -39,7 +39,7 @@ namespace
 {
     BeingInfos mPETInfos;
     bool mLoaded = false;
-}
+}  // namespace
 
 void PETDB::load()
 {
diff --git a/src/resources/db/questdb.cpp b/src/resources/db/questdb.cpp
index db67e5138..6ac2c7f34 100644
--- a/src/resources/db/questdb.cpp
+++ b/src/resources/db/questdb.cpp
@@ -41,7 +41,7 @@ namespace
     // quests: var, quests
     std::map<int, std::vector<QuestItem*> > mQuests;
     std::vector<QuestEffect*> mAllEffects;
-}
+}  // namespace
 
 void QuestDb::load()
 {
diff --git a/src/resources/db/skillunitdb.cpp b/src/resources/db/skillunitdb.cpp
index b5c4592ad..33f41cacb 100644
--- a/src/resources/db/skillunitdb.cpp
+++ b/src/resources/db/skillunitdb.cpp
@@ -39,7 +39,7 @@ namespace
 {
     BeingInfos mSkillUnitInfos;
     bool mLoaded = false;
-}
+}  // namespace
 
 void SkillUnitDb::load()
 {
diff --git a/src/resources/db/sounddb.cpp b/src/resources/db/sounddb.cpp
index 47eb99232..0907f5cdc 100644
--- a/src/resources/db/sounddb.cpp
+++ b/src/resources/db/sounddb.cpp
@@ -33,7 +33,7 @@ namespace
 {
     std::string mDefault;
     std::vector<std::string> mSounds;
-}
+}  // namespace
 
 void SoundDB::load()
 {
diff --git a/src/resources/db/textdb.h b/src/resources/db/textdb.h
index c61bb0c7a..2eb438336 100644
--- a/src/resources/db/textdb.h
+++ b/src/resources/db/textdb.h
@@ -39,6 +39,6 @@ namespace TextDb
     const StringVect &getTexts();
 
     void unload();
-}  // namespace LanguageDB
+}  // namespace TextDb
 
 #endif  // RESOURCES_DB_TEXTDB_H
diff --git a/src/resources/db/weaponsdb.cpp b/src/resources/db/weaponsdb.cpp
index 262199d6f..e75b15f02 100644
--- a/src/resources/db/weaponsdb.cpp
+++ b/src/resources/db/weaponsdb.cpp
@@ -32,7 +32,7 @@ namespace
     WeaponsInfos mSwords;
     WeaponsInfos mShields;
     bool mLoaded = false;
-}
+}  // namespace
 
 static void loadDB(const std::string &name,
                    WeaponsInfos &arr)
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 502fbfbf7..3df93e978 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -40,7 +40,7 @@
 namespace ColorDB
 {
     class ItemColorData;
-}
+}  // namespace ColorDB
 
 // sprite, <itemfrom, itemto>
 typedef std::map<int, IntMap> SpriteToItemMap;
diff --git a/src/resources/sdlgfxblitfunc.cpp b/src/resources/sdlgfxblitfunc.cpp
index 109ddaa2e..f419893a6 100644
--- a/src/resources/sdlgfxblitfunc.cpp
+++ b/src/resources/sdlgfxblitfunc.cpp
@@ -327,7 +327,7 @@ namespace
         254,  /* 254 */
         255   /* 255 */
     };
-}
+}  // namespace
 
 static void _SDL_gfxBlitBlitterRGBA(SDL_gfxBlitInfo *info)
 {
diff --git a/src/utils/browserboxtools.h b/src/utils/browserboxtools.h
index 1e267ed2b..8caa0d89c 100644
--- a/src/utils/browserboxtools.h
+++ b/src/utils/browserboxtools.h
@@ -34,6 +34,6 @@ namespace BrowserBoxTools
     std::string replaceLinkCommands(const std::string &link);
 
     void replaceTabs(std::string &data);
-}  // BrowserBoxTools
+}  // namespace BrowserBoxTools
 
 #endif  // UTILS_BROWSERBOXTOOLS_H