Remove useless A_CONST attributes.

66 files changed, 261 insertions, 300 deletions

diff --git a/src/being/being.h b/src/being/being.h
index 04e6cb6ef..4e672ef52 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -265,7 +265,7 @@ class Being notfinal : public ActorSprite,
          */
         void setGuildName(const std::string &restrict name) restrict2;
 
-        void setGuildPos(const std::string &restrict pos) restrict2 A_CONST;
+        void setGuildPos(const std::string &restrict pos) restrict2;
 
         /**
          * Adds a guild to the being.
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index fdb45d0e6..f8faaaecb 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -358,7 +358,7 @@ class LocalPlayer final : public Being,
 
         int getPathLength(const Being *const being) const A_WARN_UNUSED;
 
-        void targetMoved() const A_CONST;
+        void targetMoved() const;
 
         void setLastHitFrom(const std::string &n)
         { mLastHitFrom = n; }
diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h
index 4513372f6..81caa971f 100644
--- a/src/being/playerinfo.h
+++ b/src/being/playerinfo.h
@@ -202,7 +202,7 @@ namespace PlayerInfo
     /**
      * Initializes some internals.
      */
-    void init() A_CONST;
+    void init();
 
     void deinit();
 
diff --git a/src/dirs.h b/src/dirs.h
index 2dc5234f4..42547dd8c 100644
--- a/src/dirs.h
+++ b/src/dirs.h
@@ -38,7 +38,7 @@ class Dirs final
         static void extractDataDir();
 #else  // defined(ANDROID) && defined(USE_SDL2)
 
-        static void extractDataDir() A_CONST;
+        static void extractDataDir();
 #endif  // defined(ANDROID) && defined(USE_SDL2)
 
         static void mountDataDir();
diff --git a/src/gui/popupmanager.h b/src/gui/popupmanager.h
index da5127211..352887a5e 100644
--- a/src/gui/popupmanager.h
+++ b/src/gui/popupmanager.h
@@ -31,14 +31,14 @@ class PopupManager final
         /**
          * Constructor.
          */
-        PopupManager() A_CONST;
+        PopupManager();
 
         A_DELETE_COPY(PopupManager)
 
         /**
          * Destructor.
          */
-        ~PopupManager() A_CONST;
+        ~PopupManager();
 
         static bool isBeingPopupVisible() A_WARN_UNUSED;
 
diff --git a/src/gui/shortcut/spellshortcut.h b/src/gui/shortcut/spellshortcut.h
index c02e0ee4f..33c6b77d7 100644
--- a/src/gui/shortcut/spellshortcut.h
+++ b/src/gui/shortcut/spellshortcut.h
@@ -41,7 +41,7 @@ class SpellShortcut final
         /**
          * Destructor.
          */
-        ~SpellShortcut() A_CONST;
+        ~SpellShortcut();
 
         /**
          * Load the configuration information.
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index aa647a23f..4b391c54b 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -47,7 +47,7 @@ class AvatarListBox final : public ListBox,
 
         void mousePressed(MouseEvent &event) override final;
 
-        void mouseReleased(MouseEvent &event A_UNUSED) override final A_CONST;
+        void mouseReleased(MouseEvent &event A_UNUSED) override final;
 
         void optionChanged(const std::string &value) override final;
 
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index c8af26215..61e92d24a 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -55,9 +55,9 @@ class CharacterDisplay final : public Container,
         Net::Character *getCharacter() const
         { return mCharacter; }
 
-        void requestFocus() override final A_CONST;
+        void requestFocus() override final;
 
-        void setActive(const bool active) A_CONST;
+        void setActive(const bool active);
 
         bool isSelectFocused() const
         { return false; }
diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h
index 9920096d7..8c36545e8 100644
--- a/src/gui/widgets/characterviewnormal.h
+++ b/src/gui/widgets/characterviewnormal.h
@@ -40,7 +40,7 @@ class CharacterViewNormal final : public CharacterViewBase
 
         void resize() override;
 
-        void action(const ActionEvent &event A_UNUSED) override final A_CONST;
+        void action(const ActionEvent &event A_UNUSED) override final;
 
     private:
         STD_VECTOR<CharacterDisplay*> *mCharacterEntries;
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 90f72f24a..dfc6e5c26 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -100,7 +100,7 @@ class DropDown final : public ActionListener,
 
         std::string getSelectedString() const A_WARN_UNUSED;
 
-        void valueChanged(const SelectionEvent& event) override final A_CONST;
+        void valueChanged(const SelectionEvent& event) override final;
 
         void updateSelection();
 
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 2c15a989a..2665bfebc 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -59,7 +59,7 @@ class EmoteShortcutContainer final : public ShortcutContainer
          * Handles mouse when dragged.
          */
         void mouseDragged(MouseEvent &restrict event)
-                          restrict2 override final A_CONST;
+                          restrict2 override final;
 
         /**
          * Handles mouse when pressed.
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index a967897ed..91597c844 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -51,7 +51,7 @@ class HorizontContainer final : public Container,
 
         void clear() override;
 
-        void widgetResized(const Event &event) override final A_CONST;
+        void widgetResized(const Event &event) override final;
 
     protected:
         int mSpacing;
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index d78e01198..bfebad168 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -77,8 +77,8 @@ class ItemContainer final : public Widget,
         void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
 
         // KeyListener
-        void keyPressed(KeyEvent &event) override final A_CONST;
-        void keyReleased(KeyEvent &event) override final A_CONST;
+        void keyPressed(KeyEvent &event) override final;
+        void keyReleased(KeyEvent &event) override final;
 
         // MouseListener
         void mousePressed(MouseEvent &event) override final;
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 8d4600d0d..1dac89412 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -123,9 +123,9 @@ class ListBox notfinal : public Widget,
 
         // Inherited from MouseListener
 
-        void mouseWheelMovedUp(MouseEvent& event) override final A_CONST;
+        void mouseWheelMovedUp(MouseEvent& event) override final;
 
-        void mouseWheelMovedDown(MouseEvent& event) override final A_CONST;
+        void mouseWheelMovedDown(MouseEvent& event) override final;
 
         void mousePressed(MouseEvent &event) override;
 
diff --git a/src/gui/widgets/setupbuttonitem.h b/src/gui/widgets/setupbuttonitem.h
index 0cc6d1cc7..266d65cbf 100644
--- a/src/gui/widgets/setupbuttonitem.h
+++ b/src/gui/widgets/setupbuttonitem.h
@@ -43,23 +43,23 @@ class SetupButtonItem final : public SetupItem
 
         void createControls();
 
-        void fromWidget() override final A_CONST;
+        void fromWidget() override final;
 
-        void toWidget() override final A_CONST;
+        void toWidget() override final;
 
-        void action(const ActionEvent &event) override final A_CONST;
+        void action(const ActionEvent &event) override final;
 
-        void apply(const std::string &eventName) override final A_CONST;
+        void apply(const std::string &eventName) override final;
 
         void cancel(const std::string &eventName A_UNUSED)
-                    override final A_CONST;
+                    override final;
 
         void externalUpdated(const std::string &eventName A_UNUSED)
-                             override final A_CONST;
+                             override final;
 
-        void rereadValue() override final A_CONST;
+        void rereadValue() override final;
 
-        void save() override final A_CONST;
+        void save() override final;
 
     protected:
         HorizontContainer *mHorizont;
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index e7d449d3c..b2a891eb5 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -91,7 +91,7 @@ class SetupItem notfinal : public ActionListener,
 
         virtual void externalUpdated(const std::string &eventName);
 
-        virtual void externalUnloaded(const std::string &eventName) A_CONST;
+        virtual void externalUnloaded(const std::string &eventName);
 
         MainConfig isMainConfig() const noexcept2 A_WARN_UNUSED
         { return mMainConfig; }
@@ -295,13 +295,13 @@ class SetupItemLabel final : public SetupItem
 
         void createControls();
 
-        void fromWidget() override final A_CONST;
+        void fromWidget() override final;
 
-        void toWidget() override final A_CONST;
+        void toWidget() override final;
 
-        void action(const ActionEvent &event) override final A_CONST;
+        void action(const ActionEvent &event) override final;
 
-        void apply(const std::string &eventName) override final A_CONST;
+        void apply(const std::string &eventName) override final;
 
     protected:
         Label *mLabel;
diff --git a/src/gui/widgets/setupquickitem.h b/src/gui/widgets/setupquickitem.h
index 61a7b4932..4b8444b6a 100644
--- a/src/gui/widgets/setupquickitem.h
+++ b/src/gui/widgets/setupquickitem.h
@@ -49,23 +49,22 @@ class SetupQuickItem final : public SetupItem,
 
         void createControls();
 
-        void fromWidget() override final A_CONST;
+        void fromWidget() override final;
 
         void toWidget() override final;
 
         void action(const ActionEvent &event) override final;
 
-        void apply(const std::string &eventName) override final A_CONST;
+        void apply(const std::string &eventName) override final;
 
-        void cancel(const std::string &eventName A_UNUSED) override final
-                    A_CONST;
+        void cancel(const std::string &eventName A_UNUSED) override final;
 
         void externalUpdated(const std::string &eventName A_UNUSED)
-                             override final A_CONST;
+                             override final;
 
-        void rereadValue() override final A_CONST;
+        void rereadValue() override final;
 
-        void save() override final A_CONST;
+        void save() override final;
 
         void gameModifiersChanged() override final;
 
diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h
index 70ab7198e..1f2dff882 100644
--- a/src/gui/widgets/tabs/chat/gmtab.h
+++ b/src/gui/widgets/tabs/chat/gmtab.h
@@ -37,11 +37,11 @@ class GmTab final : public ChatTab
 
     protected:
         void getAutoCompleteList(StringVect &names) const
-                                 override final A_CONST;
+                                 override final;
 
         void handleInput(const std::string &msg) override final;
 
-        void handleCommandStr(const std::string &msg) override final A_CONST;
+        void handleCommandStr(const std::string &msg) override final;
 };
 
 extern GmTab *gmChatTab;
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index 920169158..8d956c619 100644
--- a/src/gui/widgets/tabs/setup_relations.h
+++ b/src/gui/widgets/tabs/setup_relations.h
@@ -48,7 +48,7 @@ class Setup_Relations final : public SetupTab,
 
         void apply() override final;
 
-        void cancel() override final A_CONST;
+        void cancel() override final;
 
         void reset();
 
diff --git a/src/gui/widgets/tabs/setuptab.h b/src/gui/widgets/tabs/setuptab.h
index 68c3dd191..39ec26e45 100644
--- a/src/gui/widgets/tabs/setuptab.h
+++ b/src/gui/widgets/tabs/setuptab.h
@@ -53,9 +53,9 @@ class SetupTab notfinal : public Container,
          */
         virtual void cancel() = 0;
 
-        virtual void externalUpdated() A_CONST;
+        virtual void externalUpdated();
 
-        virtual void externalUnloaded() A_CONST;
+        virtual void externalUnloaded();
 
     protected:
         explicit SetupTab(const Widget2 *const widget);
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 217c35565..e4ac1b173 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -181,10 +181,10 @@ class TextField notfinal : public Widget,
         void focusGained(const Event &event) override final;
 #else  // ANDROID
 
-        void focusGained(const Event &event) override final A_CONST;
+        void focusGained(const Event &event) override final;
 #endif  // ANDROID
 
-        void focusLost(const Event &event) override A_CONST;
+        void focusLost(const Event &event) override;
 
         void moveCaretBack();
 
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index cac772778..6ffdf4f0a 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -46,7 +46,7 @@ class WidgetGroup notfinal : public Container,
 
         void clear() override final;
 
-        void widgetResized(const Event &event) override final A_CONST;
+        void widgetResized(const Event &event) override final;
 
         virtual Widget *createWidget(const std::string &name,
                                      const bool pressed)
diff --git a/src/input/touch/multitouchmanager.h b/src/input/touch/multitouchmanager.h
index 357b73325..809adae03 100644
--- a/src/input/touch/multitouchmanager.h
+++ b/src/input/touch/multitouchmanager.h
@@ -50,7 +50,7 @@ class MultiTouchManager final
 
         A_DELETE_COPY(MultiTouchManager)
 
-        void init() A_CONST;
+        void init();
 
 #ifdef USE_SDL2
         void updateFinger(const SDL_Event &event, const bool active);
diff --git a/src/navigationmanager.h b/src/navigationmanager.h
index aa46c68cb..d77b13028 100644
--- a/src/navigationmanager.h
+++ b/src/navigationmanager.h
@@ -31,11 +31,11 @@ struct MetaTile;
 class NavigationManager final
 {
     public:
-        NavigationManager() A_CONST;
+        NavigationManager();
 
         A_DELETE_COPY(NavigationManager)
 
-        ~NavigationManager() A_CONST;
+        ~NavigationManager();
 
 #ifndef DYECMD
         static Resource *loadWalkLayer(const Map *const map);
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index 93205d9bc..8a7be8680 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -43,11 +43,11 @@ class AdminHandler notfinal : public Net::AdminHandler
 
         void kickName(const std::string &name) const override final;
 
-        void ban(const int playerId) const override final A_CONST;
+        void ban(const int playerId) const override final;
 
         void banName(const std::string &name) const override final;
 
-        void unban(const int playerId) const override final A_CONST;
+        void unban(const int playerId) const override final;
 
         void unbanName(const std::string &name) const override final;
 
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index 3a1c1706c..b8ca646f0 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -35,7 +35,7 @@ class GameHandler notfinal : public Net::GameHandler
 
         A_DELETE_COPY(GameHandler)
 
-        void who() const override final A_CONST;
+        void who() const override final;
 
         bool removeDeadBeings() const override final A_WARN_UNUSED
         { return true; }
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 34619256b..7b7fda562 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -47,10 +47,10 @@ class InventoryHandler notfinal : public Net::InventoryHandler
                       override final A_CONST A_WARN_UNUSED;
 
         void splitItem(const Item *const item,
-                       const int amount) const override final A_CONST;
+                       const int amount) const override final;
 
         void moveItem(const int oldIndex,
-                      const int newIndex) const override final A_CONST;
+                      const int newIndex) const override final;
 
         size_t getSize(const InventoryTypeT type) const override final
                        A_CONST A_WARN_UNUSED;
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index db5180e07..ec7e9d93f 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -62,14 +62,14 @@ class LoginHandler notfinal : public Net::LoginHandler
 
         const Token &getToken() const A_CONST A_WARN_UNUSED;
 
-        void logout() const override final A_CONST;
+        void logout() const override final;
 
         void changeEmail(const std::string &email) const
-                         override final A_CONST;
+                         override final;
 
         void unregisterAccount(const std::string &username,
                                const std::string &password)
-                               const override final A_CONST;
+                               const override final;
 
         void loginOrRegister(LoginData *const data) const override final;
 
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 2e7c651dd..42672d553 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -37,7 +37,7 @@ class PartyHandler notfinal : public Net::PartyHandler
 
         ~PartyHandler() override;
 
-        void join(const int partyId) const override final A_CONST;
+        void join(const int partyId) const override final;
 
         PartyShareT getShareExperience() const override final A_WARN_UNUSED;
 
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 3ca97acc2..436ff5ffb 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -36,9 +36,9 @@ class PlayerHandler notfinal : public Net::PlayerHandler
         A_DELETE_COPY(PlayerHandler)
 
         void ignorePlayer(const std::string &player,
-                          const bool ignore) const override final A_CONST;
+                          const bool ignore) const override final;
 
-        void ignoreAll(const bool ignore) const override final A_CONST;
+        void ignoreAll(const bool ignore) const override final;
 
         bool canUseMagic() const override final;
 
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index dacd772bc..2d1d3b74b 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -36,7 +36,7 @@ class TradeHandler notfinal : public Net::TradeHandler
         A_DELETE_COPY(TradeHandler)
 
         void removeItem(const int slotNum,
-                        const int amount) const override final A_CONST;
+                        const int amount) const override final;
 };
 
 }  // namespace Ea
diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h
index 74c9dfa67..feeb7f887 100644
--- a/src/net/eathena/buysellhandler.h
+++ b/src/net/eathena/buysellhandler.h
@@ -38,18 +38,18 @@ class BuySellHandler final : public Ea::BuySellHandler
         ~BuySellHandler() override final;
 
         void requestSellList(const std::string &nick)
-                             const override final A_CONST;
+                             const override final;
 
         void requestBuyList(const std::string &nick)
-                            const override final A_CONST;
+                            const override final;
 
         void sendBuyRequest(const std::string &nick,
                             const ShopItem *const item,
-                            const int amount) const override final A_CONST;
+                            const int amount) const override final;
 
         void sendSellRequest(const std::string &nick,
                              const ShopItem *const item,
-                             const int amount) const override final A_CONST;
+                             const int amount) const override final;
 
         void close() const override final;
 };
diff --git a/src/net/eathena/cashshophandler.h b/src/net/eathena/cashshophandler.h
index 904a1db55..cff900bc0 100644
--- a/src/net/eathena/cashshophandler.h
+++ b/src/net/eathena/cashshophandler.h
@@ -40,8 +40,8 @@ class CashShopHandler final : public Net::CashShopHandler
                      const int amount) const override final;
 
         void buyItems(const int points,
-                      const STD_VECTOR<ShopItem*> &items) const override final
-                      A_CONST;
+                      const STD_VECTOR<ShopItem*> &items) const
+                      override final;
 
         void close() const override final;
 
diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h
index a71b43f23..662873e00 100644
--- a/src/net/eathena/charserverhandler.h
+++ b/src/net/eathena/charserverhandler.h
@@ -64,8 +64,7 @@ class CharServerHandler final : public Ea::CharServerHandler
 
         bool isNeedCreatePin() const override final A_WARN_UNUSED;
 
-        void setNewPincode(const std::string &pin) const override final
-                           A_CONST;
+        void setNewPincode(const std::string &pin) const override final;
 
         /**
          * Sets the character create dialog. The handler will clean up this
diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h
index 4449bb6ae..2f7474cd0 100644
--- a/src/net/eathena/gamehandler.h
+++ b/src/net/eathena/gamehandler.h
@@ -47,7 +47,7 @@ class GameHandler final : public Ea::GameHandler
 
         void ping(const int tick) const override final;
 
-        void disconnect2() const override final A_CONST;
+        void disconnect2() const override final;
 
         void mapLoadedEvent() const override final;
 
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index afaa546d1..79eb3ed55 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -45,14 +45,14 @@ class AdminHandler final : public Ea::AdminHandler
 
         void kick(const BeingId playerId) const override final;
 
-        void kickAll() const override final A_CONST;
+        void kickAll() const override final;
 
         void warp(const std::string &map,
                   const int x, const int y) const override final;
 
-        void resetStats() const override final A_CONST;
+        void resetStats() const override final;
 
-        void resetSkills() const override final A_CONST;
+        void resetSkills() const override final;
 
         void gotoName(const std::string &name) const override final;
 
@@ -60,115 +60,101 @@ class AdminHandler final : public Ea::AdminHandler
 
         void mute(const Being *const being,
                   const int type,
-                  const int limit) const override final A_CONST;
+                  const int limit) const override final;
 
-        void muteName(const std::string &name) const override final A_CONST;
+        void muteName(const std::string &name) const override final;
 
-        void requestLogin(const Being *const being) const override final
-                          A_CONST;
+        void requestLogin(const Being *const being) const override final;
 
         void setTileType(const int x, const int y,
-                         const int type) const override final A_CONST;
+                         const int type) const override final;
 
-        void unequipAll(const Being *const being) const override final A_CONST;
+        void unequipAll(const Being *const being) const override final;
 
-        void requestStats(const std::string &name) const override final
-                          A_CONST;
+        void requestStats(const std::string &name) const override final;
 
-        void monsterInfo(const std::string &name) const override final A_CONST;
+        void monsterInfo(const std::string &name) const override final;
 
-        void itemInfo(const std::string &name) const override final A_CONST;
+        void itemInfo(const std::string &name) const override final;
 
-        void whoDrops(const std::string &name) const override final A_CONST;
+        void whoDrops(const std::string &name) const override final;
 
-        void mobSearch(const std::string &name) const override final A_CONST;
+        void mobSearch(const std::string &name) const override final;
 
-        void mobSpawnSearch(const std::string &name) const override final
-                            A_CONST;
+        void mobSpawnSearch(const std::string &name) const override final;
 
-        void playerGmCommands(const std::string &name) const override final
-                              A_CONST;
+        void playerGmCommands(const std::string &name) const override final;
 
-        void playerCharGmCommands(const std::string &name) const override final
-                                  A_CONST;
+        void playerCharGmCommands(const std::string &name) const
+                                  override final;
 
-        void showLevel(const std::string &name) const override final A_CONST;
+        void showLevel(const std::string &name) const override final;
 
-        void showStats(const std::string &name) const override final A_CONST;
+        void showStats(const std::string &name) const override final;
 
-        void showStorageList(const std::string &name) const override final
-                             A_CONST;
+        void showStorageList(const std::string &name) const override final;
 
-        void showCartList(const std::string &name) const override final
-                          A_CONST;
+        void showCartList(const std::string &name) const override final;
 
-        void showInventoryList(const std::string &name) const override final
-                               A_CONST;
+        void showInventoryList(const std::string &name) const override final;
 
-        void locatePlayer(const std::string &name) const override final
-                          A_CONST;
+        void locatePlayer(const std::string &name) const override final;
 
-        void showAccountInfo(const std::string &name) const override final
-                             A_CONST;
+        void showAccountInfo(const std::string &name) const override final;
 
-        void spawnSlave(const std::string &name) const override final A_CONST;
+        void spawnSlave(const std::string &name) const override final;
 
-        void spawnClone(const std::string &name) const override final A_CONST;
+        void spawnClone(const std::string &name) const override final;
 
-        void spawnSlaveClone(const std::string &name) const override final
-                             A_CONST;
+        void spawnSlaveClone(const std::string &name) const override final;
 
-        void spawnEvilClone(const std::string &name) const override final
-                            A_CONST;
+        void spawnEvilClone(const std::string &name) const override final;
 
-        void savePosition(const std::string &name) const override final
-                          A_CONST;
+        void savePosition(const std::string &name) const override final;
 
-        void loadPosition(const std::string &name) const override final
-                          A_CONST;
+        void loadPosition(const std::string &name) const override final;
 
-        void randomWarp(const std::string &name) const override final A_CONST;
+        void randomWarp(const std::string &name) const override final;
 
-        void gotoNpc(const std::string &name) const override final A_CONST;
+        void gotoNpc(const std::string &name) const override final;
 
-        void killer(const std::string &name) const override final A_CONST;
+        void killer(const std::string &name) const override final;
 
-        void killable(const std::string &name) const override final A_CONST;
+        void killable(const std::string &name) const override final;
 
-        void heal(const std::string &name) const override final A_CONST;
+        void heal(const std::string &name) const override final;
 
         void alive(const std::string &name) const override final;
 
-        void disguise(const std::string &name) const override final A_CONST;
+        void disguise(const std::string &name) const override final;
 
-        void immortal(const std::string &name) const override final A_CONST;
+        void immortal(const std::string &name) const override final;
 
         void hide(const std::string &name) const override final;
 
-        void nuke(const std::string &name) const override final A_CONST;
+        void nuke(const std::string &name) const override final;
 
-        void kill(const std::string &name) const override final A_CONST;
+        void kill(const std::string &name) const override final;
 
-        void jail(const std::string &name) const override final A_CONST;
+        void jail(const std::string &name) const override final;
 
-        void unjail(const std::string &name) const override final A_CONST;
+        void unjail(const std::string &name) const override final;
 
         void npcMove(const std::string &name,
                      const int x,
-                     const int y) const override final A_CONST;
+                     const int y) const override final;
 
-        void hideNpc(const std::string &name) const override final A_CONST;
+        void hideNpc(const std::string &name) const override final;
 
-        void showNpc(const std::string &name) const override final A_CONST;
+        void showNpc(const std::string &name) const override final;
 
-        void changePartyLeader(const std::string &name) const override final
-                               A_CONST;
+        void changePartyLeader(const std::string &name) const override final;
 
-        void partyRecall(const std::string &name) const override final A_CONST;
+        void partyRecall(const std::string &name) const override final;
 
-        void breakGuild(const std::string &name) const override final A_CONST;
+        void breakGuild(const std::string &name) const override final;
 
-        void guildRecall(const std::string &name) const override final A_CONST;
+        void guildRecall(const std::string &name) const override final;
 
         void slide(const int x, const int y) const override final;
 };
diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h
index 1d5b8771e..28ec0ae71 100644
--- a/src/net/tmwa/auctionhandler.h
+++ b/src/net/tmwa/auctionhandler.h
@@ -34,30 +34,30 @@ class AuctionHandler final : public Net::AuctionHandler
 
         ~AuctionHandler() override final;
 
-        void cancelReg() const override final A_CONST;
+        void cancelReg() const override final;
 
         void setItem(const Item *const item,
-                     const int amount) const override final A_CONST;
+                     const int amount) const override final;
 
         void reg(const int currentPrice,
                  const int maxPrice,
-                 const int hours) const override final A_CONST;
+                 const int hours) const override final;
 
-        void cancel(const int auctionId) const override final A_CONST;
+        void cancel(const int auctionId) const override final;
 
-        void close(const int auctionId) const override final A_CONST;
+        void close(const int auctionId) const override final;
 
         void bid(const int auctionId,
-                 const int money) const override final A_CONST;
+                 const int money) const override final;
 
         void search(const AuctionSearchTypeT type,
                     const int auctionId,
                     const std::string &text,
-                    const int page) const override final A_CONST;
+                    const int page) const override final;
 
-        void buy() const override final A_CONST;
+        void buy() const override final;
 
-        void sell() const override final A_CONST;
+        void sell() const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/bankhandler.h b/src/net/tmwa/bankhandler.h
index 0f95dcd49..4b436ff91 100644
--- a/src/net/tmwa/bankhandler.h
+++ b/src/net/tmwa/bankhandler.h
@@ -35,15 +35,15 @@ class BankHandler final : public Net::BankHandler
 
         ~BankHandler() override final;
 
-        void deposit(const int money) const override final A_CONST;
+        void deposit(const int money) const override final;
 
-        void withdraw(const int money) const override final A_CONST;
+        void withdraw(const int money) const override final;
 
-        void check() const override final A_CONST;
+        void check() const override final;
 
-        void open() const override final A_CONST;
+        void open() const override final;
 
-        void close() const override final A_CONST;
+        void close() const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/battlegroundhandler.h b/src/net/tmwa/battlegroundhandler.h
index f100ed96f..e9547846b 100644
--- a/src/net/tmwa/battlegroundhandler.h
+++ b/src/net/tmwa/battlegroundhandler.h
@@ -36,17 +36,15 @@ class BattleGroundHandler final : public Net::BattleGroundHandler
         ~BattleGroundHandler() override final;
 
         void registerBg(const BattleGroundTypeT &type,
-                        const std::string &name) const override final A_CONST;
+                        const std::string &name) const override final;
 
-        void rekoveRequest(const std::string &name) const override final
-                           A_CONST;
+        void rekoveRequest(const std::string &name) const override final;
 
         void beginAck(const bool result,
                       const std::string &bgName,
-                      const std::string &gameName) const override final
-                      A_CONST;
+                      const std::string &gameName) const override final;
 
-        void checkState(const std::string &name) const override final A_CONST;
+        void checkState(const std::string &name) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 0fb38d951..06769e668 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -41,13 +41,12 @@ class BeingHandler final : public Ea::BeingHandler
 
         void undress(Being *const being) const override final;
 
-        void requestRanks(const RankT rank A_UNUSED) const override final
-                          A_CONST;
+        void requestRanks(const RankT rank A_UNUSED) const override final;
 
-        void viewPlayerEquipment(const Being *const being) const override final
-                                 A_CONST;
+        void viewPlayerEquipment(const Being *const being) const
+                                 override final;
 
-        void requestNameByCharId(const int id) const override final A_CONST;
+        void requestNameByCharId(const int id) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/buyingstorehandler.h b/src/net/tmwa/buyingstorehandler.h
index bb48261b1..324a4bd05 100644
--- a/src/net/tmwa/buyingstorehandler.h
+++ b/src/net/tmwa/buyingstorehandler.h
@@ -38,17 +38,16 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler
         void create(const std::string &name,
                     const int maxMoney,
                     const bool flag,
-                    const STD_VECTOR<ShopItem*> &items) const override final
-                    A_CONST;
+                    const STD_VECTOR<ShopItem*> &items) const override final;
 
-        void close() const override final A_CONST;
+        void close() const override final;
 
-        void open(const Being *const being) const override final A_CONST;
+        void open(const Being *const being) const override final;
 
         void sell(const Being *const being,
                   const int storeId,
                   const Item *const item,
-                  const int amount) const override final A_CONST;
+                  const int amount) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index 00c1e79a4..627ed4c66 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -51,7 +51,7 @@ class BuySellHandler final : public Ea::BuySellHandler
                              const ShopItem *const item,
                              const int amount) const override final;
 
-        void close() const override final A_CONST;
+        void close() const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/cashshophandler.h b/src/net/tmwa/cashshophandler.h
index b96fdf4a0..6c3883e13 100644
--- a/src/net/tmwa/cashshophandler.h
+++ b/src/net/tmwa/cashshophandler.h
@@ -38,19 +38,18 @@ class CashShopHandler final : public Net::CashShopHandler
         void buyItem(const int points,
                      const int itemId,
                      const ItemColor color,
-                     const int amount) const override final A_CONST;
+                     const int amount) const override final;
 
         void buyItems(const int points,
-                      const STD_VECTOR<ShopItem*> &items) const override final
-                      A_CONST;
+                      const STD_VECTOR<ShopItem*> &items) const override final;
 
-        void close() const override final A_CONST;
+        void close() const override final;
 
-        void requestPoints() const override final A_CONST;
+        void requestPoints() const override final;
 
-        void requestTab(const int tab) const override final A_CONST;
+        void requestTab(const int tab) const override final;
 
-        void schedule() const override final A_CONST;
+        void schedule() const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 99d72304a..5ea4b6a5c 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -56,8 +56,7 @@ class CharServerHandler final : public Ea::CharServerHandler
                              const std::string &email) const override final;
 
         void renameCharacter(const BeingId id,
-                             const std::string &newName) const override final
-                             A_CONST;
+                             const std::string &newName) const override final;
 
         void switchCharacter() const override final;
 
@@ -79,9 +78,9 @@ class CharServerHandler final : public Ea::CharServerHandler
                                  override final;
 
         void changeSlot(const int oldSlot,
-                        const int newSlot) const override final A_CONST;
+                        const int newSlot) const override final;
 
-        void ping() const override final A_CONST;
+        void ping() const override final;
 
         unsigned int hatSprite() const override final A_CONST A_WARN_UNUSED;
 };
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 22b7a6cbe..58400b265 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -51,8 +51,7 @@ class ChatHandler final : public Ea::ChatHandler
                             const std::string &restrict text) const
                             override final;
 
-        void joinChannel(const std::string &channel) const override final
-                         A_CONST;
+        void joinChannel(const std::string &channel) const override final;
 
         void who() const override final;
 
@@ -65,39 +64,35 @@ class ChatHandler final : public Ea::ChatHandler
         void createChatRoom(const std::string &title,
                             const std::string &password,
                             const int limit,
-                            const bool isPublic) const override final A_CONST;
+                            const bool isPublic) const override final;
 
         void ignore(const std::string &nick) const override final;
 
         void unIgnore(const std::string &nick) const override final;
 
-        void requestIgnoreList() const override final A_CONST;
+        void requestIgnoreList() const override final;
 
-        void battleTalk(const std::string &text) const override final A_CONST;
+        void battleTalk(const std::string &text) const override final;
 
         void joinChat(const ChatObject *const chat,
-                      const std::string &password) const override final
-                      A_CONST;
+                      const std::string &password) const override final;
 
-        void partChannel(const std::string &channel) const override final
-                         A_CONST;
+        void partChannel(const std::string &channel) const override final;
 
         void talkPet(const std::string &restrict text,
                      const std::string &restrict channel) const override final;
 
-        void leaveChatRoom() const override final A_CONST;
+        void leaveChatRoom() const override final;
 
         void setChatRoomOptions(const int limit,
                                 const bool isPublic,
                                 const std::string &password,
-                                const std::string &title) const override final
-                                A_CONST;
+                                const std::string &title) const
+                                override final;
 
-        void setChatRoomOwner(const std::string &nick) const override final
-                              A_CONST;
+        void setChatRoomOwner(const std::string &nick) const override final;
 
-        void kickFromChatRoom(const std::string &nick) const override final
-                              A_CONST;
+        void kickFromChatRoom(const std::string &nick) const override final;
 
     protected:
         static void processRaw(MessageOut &restrict outMsg,
diff --git a/src/net/tmwa/familyhandler.h b/src/net/tmwa/familyhandler.h
index dc61dfe3f..09c8f3e82 100644
--- a/src/net/tmwa/familyhandler.h
+++ b/src/net/tmwa/familyhandler.h
@@ -35,10 +35,9 @@ class FamilyHandler final : public Net::FamilyHandler
 
         ~FamilyHandler() override final;
 
-        void askForChild(const Being *const being) const override final
-                         A_CONST;
+        void askForChild(const Being *const being) const override final;
 
-        void askForChildReply(const bool accept) const override final A_CONST;
+        void askForChildReply(const bool accept) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/friendshandler.h b/src/net/tmwa/friendshandler.h
index 88ade431a..35471baa3 100644
--- a/src/net/tmwa/friendshandler.h
+++ b/src/net/tmwa/friendshandler.h
@@ -34,14 +34,14 @@ class FriendsHandler final : public Net::FriendsHandler
 
         ~FriendsHandler() override final;
 
-        void invite(const std::string &name) const override final A_CONST;
+        void invite(const std::string &name) const override final;
 
         void inviteResponse(const int accountId,
                             const int charId,
-                            const bool accept) const override final A_CONST;
+                            const bool accept) const override final;
 
         void remove(const int accountId,
-                    const int charId) const override final A_CONST;
+                    const int charId) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 14907c3be..215eba679 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -71,30 +71,28 @@ class GuildHandler final : public Net::GuildHandler
         void checkMaster() const override final;
 
         void requestAlliance(const Being *const being) const override final
-                             A_CONST;
+                            ;
 
         void requestAllianceResponse(const int beingId,
-                                     const bool accept) const override final
-                                     A_CONST;
+                                     const bool accept) const override final;
 
         void endAlliance(const int guildId,
-                         const int flag) const override final A_CONST;
+                         const int flag) const override final;
 
         void changePostionInfo(const int posId,
                                const int mode,
                                const int ranking,
                                const int payRate,
-                               const std::string &name) const override final
-                               A_CONST;
+                               const std::string &name) const override final;
 
         void requestOpposition(const Being *const being) const override final
-                               A_CONST;
+                              ;
 
-        void breakGuild(const std::string &name) const override final A_CONST;
+        void breakGuild(const std::string &name) const override final;
 
-        void changeEmblem(std::string emblem) const override final A_CONST;
+        void changeEmblem(std::string emblem) const override final;
 
-        void requestEmblem(const int guildId) const override final A_CONST;
+        void requestEmblem(const int guildId) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/homunculushandler.h b/src/net/tmwa/homunculushandler.h
index 2eb14349a..5ff7f93d8 100644
--- a/src/net/tmwa/homunculushandler.h
+++ b/src/net/tmwa/homunculushandler.h
@@ -35,26 +35,24 @@ class HomunculusHandler final : public Net::HomunculusHandler
 
         ~HomunculusHandler() override final;
 
-        void setName(const std::string &name) const override final A_CONST;
+        void setName(const std::string &name) const override final;
 
-        void moveToMaster() const override final A_CONST;
+        void moveToMaster() const override final;
 
-        void move(const int x, const int y) const override final A_CONST;
+        void move(const int x, const int y) const override final;
 
         void attack(const BeingId targetId,
-                    const Keep keep) const override final A_CONST;
+                    const Keep keep) const override final;
 
-        void feed() const override final A_CONST;
+        void feed() const override final;
 
-        void fire() const override final A_CONST;
+        void fire() const override final;
 
-        void talk(const std::string &restrict text) const override final
-                  A_CONST;
+        void talk(const std::string &restrict text) const override final;
 
-        void emote(const uint8_t emoteId) const override final A_CONST;
+        void emote(const uint8_t emoteId) const override final;
 
-        void setDirection(const unsigned char type) const override final
-                          A_CONST;
+        void setDirection(const unsigned char type) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 9b37ce747..7fc4f78b2 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -56,15 +56,15 @@ class InventoryHandler final : public Ea::InventoryHandler
                        const int amount,
                        const InventoryTypeT destination) const override final;
 
-        void useCard(const Item *const item) override final A_CONST;
+        void useCard(const Item *const item) override final;
 
         void insertCard(const int cardIndex,
-                        const int itemIndex) const override final A_CONST;
+                        const int itemIndex) const override final;
 
         void favoriteItem(const Item *const item,
-                          const bool favorite) const override final A_CONST;
+                          const bool favorite) const override final;
 
-        void selectEgg(const Item *const item) const override final A_CONST;
+        void selectEgg(const Item *const item) const override final;
 
         int convertFromServerSlot(const int serverSlot)
                                   const override final A_WARN_UNUSED;
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 89520f63d..caea92310 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -52,13 +52,13 @@ class LoginHandler final : public Ea::LoginHandler
 
         ServerInfo *getCharServer() const override final A_CONST A_WARN_UNUSED;
 
-        void sendVersion() const override final A_CONST;
+        void sendVersion() const override final;
 
-        void ping() const override final A_CONST;
+        void ping() const override final;
 
-        void updatePacketVersion() const override final A_CONST;
+        void updatePacketVersion() const override final;
 
-        static void requestUpdateHosts() A_CONST;
+        static void requestUpdateHosts();
 
     private:
         void sendLoginRegister(const std::string &restrict username,
diff --git a/src/net/tmwa/mailhandler.h b/src/net/tmwa/mailhandler.h
index e84ea5402..3f4129771 100644
--- a/src/net/tmwa/mailhandler.h
+++ b/src/net/tmwa/mailhandler.h
@@ -35,26 +35,26 @@ class MailHandler final : public Net::MailHandler
 
         ~MailHandler() override final;
 
-        void refresh() const override final A_CONST;
+        void refresh() const override final;
 
-        void readMessage(const int msgId) const override final A_CONST;
+        void readMessage(const int msgId) const override final;
 
-        void getAttach(const int msgId) const override final A_CONST;
+        void getAttach(const int msgId) const override final;
 
-        void deleteMessage(const int msgId) const override final A_CONST;
+        void deleteMessage(const int msgId) const override final;
 
-        void returnMessage(const int msgId) const override final A_CONST;
+        void returnMessage(const int msgId) const override final;
 
         void setAttach(const int index,
-                       const int amount) const override final A_CONST;
+                       const int amount) const override final;
 
-        void setAttachMoney(const int money) const override final A_CONST;
+        void setAttachMoney(const int money) const override final;
 
-        void resetAttach(const int flag) const override final A_CONST;
+        void resetAttach(const int flag) const override final;
 
         void send(const std::string &name,
                   const std::string &title,
-                  std::string message) const override final A_CONST;
+                  std::string message) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/markethandler.h b/src/net/tmwa/markethandler.h
index c820e07a6..62b33b2d3 100644
--- a/src/net/tmwa/markethandler.h
+++ b/src/net/tmwa/markethandler.h
@@ -34,15 +34,15 @@ class MarketHandler final : public Net::MarketHandler
 
         ~MarketHandler() override final;
 
-        void close() const override final A_CONST;
+        void close() const override final;
 
         void buyItem(const int itemId,
                      const ItemTypeT type,
                      const ItemColor color,
-                     const int amount) const override final A_CONST;
+                     const int amount) const override final;
 
-        void buyItems(const STD_VECTOR<ShopItem*> &items) const override final
-                      A_CONST;
+        void buyItems(const STD_VECTOR<ShopItem*> &items) const
+                      override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h
index 98834b781..207c8b3d2 100644
--- a/src/net/tmwa/mercenaryhandler.h
+++ b/src/net/tmwa/mercenaryhandler.h
@@ -35,22 +35,20 @@ class MercenaryHandler final : public Net::MercenaryHandler
 
         ~MercenaryHandler() override final;
 
-        void fire() const override final A_CONST;
+        void fire() const override final;
 
-        void moveToMaster() const override final A_CONST;
+        void moveToMaster() const override final;
 
-        void move(const int x, const int y) const override final A_CONST;
+        void move(const int x, const int y) const override final;
 
         void attack(const BeingId targetId,
-                    const Keep keep) const override final A_CONST;
+                    const Keep keep) const override final;
 
-        void talk(const std::string &restrict text) const override final
-                  A_CONST;
+        void talk(const std::string &restrict text) const override final;
 
-        void emote(const uint8_t emoteId) const override final A_CONST;
+        void emote(const uint8_t emoteId) const override final;
 
-        void setDirection(const unsigned char type) const override final
-                          A_CONST;
+        void setDirection(const unsigned char type) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 353145929..d02d837ef 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -63,17 +63,15 @@ class NpcHandler final : public Ea::NpcHandler
                      const ItemColor color,
                      const int amount) const override final;
 
-        void buyItems(STD_VECTOR<ShopItem*> &items) const override final
-                      A_CONST;
+        void buyItems(STD_VECTOR<ShopItem*> &items) const override final;
 
         void sellItem(const BeingId beingId,
                       const int itemId,
                       const int amount) const override final;
 
-        void sellItems(STD_VECTOR<ShopItem*> &items) const override final
-                       A_CONST;
+        void sellItems(STD_VECTOR<ShopItem*> &items) const override final;
 
-        void completeProgressBar() const override final A_CONST;
+        void completeProgressBar() const override final;
 
         BeingId getNpc(Net::MessageIn &msg,
                        const NpcActionT action) override final;
@@ -81,20 +79,20 @@ class NpcHandler final : public Ea::NpcHandler
         void produceMix(const int nameId,
                         const int materialId1,
                         const int materialId2,
-                        const int materialId3) const override final A_CONST;
+                        const int materialId3) const override final;
 
         void cooking(const CookingTypeT type,
-                     const int nameId) const override final A_CONST;
+                     const int nameId) const override final;
 
-        void repair(const int index) const override final A_CONST;
+        void repair(const int index) const override final;
 
-        void refine(const int index) const override final A_CONST;
+        void refine(const int index) const override final;
 
-        void identify(const int index) const override final A_CONST;
+        void identify(const int index) const override final;
 
-        void selectArrow(const int nameId) const override final A_CONST;
+        void selectArrow(const int nameId) const override final;
 
-        void selectAutoSpell(const int skillId) const override final A_CONST;
+        void selectAutoSpell(const int skillId) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 8040e168c..ee7aab7a1 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -55,10 +55,9 @@ class PartyHandler final : public Ea::PartyHandler
 
         void setShareItems(const PartyShareT share) const override final;
 
-        void changeLeader(const std::string &name) const override final
-                          A_CONST;
+        void changeLeader(const std::string &name) const override final;
 
-        void allowInvite(const bool allow) const override final A_CONST;
+        void allowInvite(const bool allow) const override final;
 
         void setShareAutoItems(const PartyShareT share) const override final;
 
diff --git a/src/net/tmwa/pethandler.h b/src/net/tmwa/pethandler.h
index 492a5ce2f..884110932 100644
--- a/src/net/tmwa/pethandler.h
+++ b/src/net/tmwa/pethandler.h
@@ -40,21 +40,21 @@ class PetHandler final : public Net::PetHandler
 
         void emote(const uint8_t emoteId) override final;
 
-        void catchPet(const Being *const being) const override final A_CONST;
+        void catchPet(const Being *const being) const override final;
 
-        void sendPetMessage(const int data) const override final A_CONST;
+        void sendPetMessage(const int data) const override final;
 
-        void setName(const std::string &name) const override final A_CONST;
+        void setName(const std::string &name) const override final;
 
-        void requestStatus() const override final A_CONST;
+        void requestStatus() const override final;
 
-        void feed() const override final A_CONST;
+        void feed() const override final;
 
-        void dropLoot() const override final A_CONST;
+        void dropLoot() const override final;
 
-        void returnToEgg() const override final A_CONST;
+        void returnToEgg() const override final;
 
-        void unequip() const override final A_CONST;
+        void unequip() const override final;
 
         void setDirection(const unsigned char type) const override final;
 
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index 398030af1..fca26b2b8 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -52,33 +52,33 @@ class PlayerHandler final : public Ea::PlayerHandler
                             const int direction) const override final;
         void changeAction(const BeingActionT &action)
                           const override final;
-        void requestOnlineList() const override final A_CONST;
-        void updateStatus(const uint8_t status) const override final A_CONST;
+        void requestOnlineList() const override final;
+        void updateStatus(const uint8_t status) const override final;
 
         void respawn() const override final;
 
         void setShortcut(const int idx,
                          const uint8_t type,
                          const int id,
-                         const int level) const override final A_CONST;
+                         const int level) const override final;
 
         void shortcutShiftRow(const int row) const override final;
 
-        void removeOption() const override final A_CONST;
+        void removeOption() const override final;
 
-        void changeCart(const int type) const override final A_CONST;
+        void changeCart(const int type) const override final;
 
-        void setMemo() const override final A_CONST;
+        void setMemo() const override final;
 
-        void doriDori() const override final A_CONST;
+        void doriDori() const override final;
 
-        void explosionSpirits() const override final A_CONST;
+        void explosionSpirits() const override final;
 
-        void requestPvpInfo() const override final A_CONST;
+        void requestPvpInfo() const override final;
 
-        void revive() const override final A_CONST;
+        void revive() const override final;
 
-        void setViewEquipment(const bool allow) const override final A_CONST;
+        void setViewEquipment(const bool allow) const override final;
 
         void setStat(Net::MessageIn &msg,
                      const int type,
diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h
index b7c3d336f..bbb16429c 100644
--- a/src/net/tmwa/questhandler.h
+++ b/src/net/tmwa/questhandler.h
@@ -36,8 +36,7 @@ class QuestHandler final : public Net::QuestHandler
         ~QuestHandler() override final;
 
         void setQeustActiveState(const int questId,
-                                 const bool active) const override final
-                                 A_CONST;
+                                 const bool active) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/searchstorehandler.h b/src/net/tmwa/searchstorehandler.h
index 3e8d11abf..b17b3cf45 100644
--- a/src/net/tmwa/searchstorehandler.h
+++ b/src/net/tmwa/searchstorehandler.h
@@ -37,15 +37,15 @@ class SearchStoreHandler final : public Net::SearchStoreHandler
         void search(const StoreSearchTypeT type,
                     const int minPrice,
                     const int maxPrice,
-                    const int itemId) const override final A_CONST;
+                    const int itemId) const override final;
 
-        void nextPage() const override final A_CONST;
+        void nextPage() const override final;
 
-        void close() const override final A_CONST;
+        void close() const override final;
 
         void select(const int accountId,
                     const int storeId,
-                    const int itemId) const override final A_CONST;
+                    const int itemId) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/vendinghandler.h b/src/net/tmwa/vendinghandler.h
index c8858e077..841bd620a 100644
--- a/src/net/tmwa/vendinghandler.h
+++ b/src/net/tmwa/vendinghandler.h
@@ -35,27 +35,27 @@ class VendingHandler final : public Net::VendingHandler
 
         ~VendingHandler() override final;
 
-        void close() const override final A_CONST;
+        void close() const override final;
 
-        void open(const Being *const being) const override final A_CONST;
+        void open(const Being *const being) const override final;
 
         void buy(const Being *const being,
                  const int index,
-                 const int amount) const override final A_CONST;
+                 const int amount) const override final;
 
         void buyItems(const Being *const being,
                       const STD_VECTOR<ShopItem*> &items) const
-                      override final A_CONST;
+                      override final;
 
         void buy2(const Being *const being,
                   const int vendId,
                   const int index,
-                  const int amount) const override final A_CONST;
+                  const int amount) const override final;
 
         void createShop(const std::string &name,
                         const bool flag,
                         const STD_VECTOR<ShopItem*> &items) const
-                        override final A_CONST;
+                        override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/particle/particle.h b/src/particle/particle.h
index f0e0cb30a..92e32ab22 100644
--- a/src/particle/particle.h
+++ b/src/particle/particle.h
@@ -71,8 +71,7 @@ class Particle notfinal : public Actor
          */
         void draw(Graphics *restrict const graphics,
                   const int offsetX,
-                  const int offsetY) const restrict2 override
-                  A_CONST A_NONNULL(2);
+                  const int offsetY) const restrict2 override A_NONNULL(2);
 
         /**
          * Necessary for sorting with the other sprites.
diff --git a/src/progs/manaplus/client.h b/src/progs/manaplus/client.h
index d7799847a..20ac722a5 100644
--- a/src/progs/manaplus/client.h
+++ b/src/progs/manaplus/client.h
@@ -112,7 +112,7 @@ class Client final : public ConfigListener,
         static void logVars();
 #else  // ANDROID
 
-        static void logVars() A_CONST;
+        static void logVars();
 #endif  // ANDROID
 
         void stateConnectGame1();
diff --git a/src/render/graphics.h b/src/render/graphics.h
index c34f6e333..35381bd21 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -258,7 +258,7 @@ class Graphics notfinal
 #ifdef USE_SDL2
             const int height) restrict2;
 #else  // USE_SDL2
-            const int height) restrict2 A_CONST;
+            const int height) restrict2;
 #endif  // USE_SDL2
 
         /**
@@ -414,7 +414,7 @@ class Graphics notfinal
         virtual void createGLContext(const bool custom) restrict2;
 #else  // USE_SDL2
 
-        virtual void createGLContext(const bool custom) restrict2 A_CONST;
+        virtual void createGLContext(const bool custom) restrict2;
 #endif  // USE_SDL2
 #endif  // USE_OPENGL
 
diff --git a/src/resources/atlas/atlasmanager.h b/src/resources/atlas/atlasmanager.h
index fe35a239f..ff342a8d8 100644
--- a/src/resources/atlas/atlasmanager.h
+++ b/src/resources/atlas/atlasmanager.h
@@ -35,7 +35,7 @@ struct TextureAtlas;
 class AtlasManager final
 {
     public:
-        AtlasManager() A_CONST;
+        AtlasManager();
 
         A_DELETE_COPY(AtlasManager)
 
diff --git a/src/resources/sdlscreenshothelper.h b/src/resources/sdlscreenshothelper.h
index 967958fc8..2c8de0868 100644
--- a/src/resources/sdlscreenshothelper.h
+++ b/src/resources/sdlscreenshothelper.h
@@ -36,7 +36,7 @@ class SdlScreenshotHelper final : public ScreenshotHelper
 
         ~SdlScreenshotHelper() override final;
 
-        void prepare() override final A_CONST;
+        void prepare() override final;
 
         SDL_Surface *getScreenshot() override final;
 };