6 files changed, 5 insertions, 11 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 2e78c048c..9ba871575 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -24,7 +24,7 @@
 
 #include "actorspritemanager.h"
 #include "client.h"
-#include "commandhandler.h"
+#include "commands.h"
 #include "configuration.h"
 #include "game.h"
 #include "guild.h"
diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp
index f448dd057..f02a86134 100644
--- a/src/gui/widgets/battletab.cpp
+++ b/src/gui/widgets/battletab.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/battletab.h"
 
 #include "chatlogger.h"
-#include "commandhandler.h"
 #include "localplayer.h"
 #include "main.h"
 
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index e35105692..4e6e7c522 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -375,8 +375,7 @@ void ChatTab::chatInput(const std::string &message)
         start = msg.find('[', start + 1);
     }
 
-    if (commandHandler)
-        commandHandler->replaceVars(msg);
+    Commands::replaceVars(msg);
 
     switch (msg[0])
     {
diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp
index 7b1ca5bd3..442bb44e2 100644
--- a/src/gui/widgets/guildchattab.cpp
+++ b/src/gui/widgets/guildchattab.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/guildchattab.h"
 
 #include "chatlogger.h"
-#include "commandhandler.h"
 #include "guild.h"
 #include "guildmanager.h"
 #include "localplayer.h"
diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp
index 78d076e12..47d47c304 100644
--- a/src/gui/widgets/tradetab.cpp
+++ b/src/gui/widgets/tradetab.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/tradetab.h"
 
 #include "chatlogger.h"
-#include "commandhandler.h"
 #include "localplayer.h"
 
 #include "net/net.h"
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index 6079b668c..c22c9d694 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -23,7 +23,7 @@
 #include "gui/widgets/whispertab.h"
 
 #include "chatlogger.h"
-#include "commandhandler.h"
+#include "commands.h"
 #include "localplayer.h"
 
 #include "net/chathandler.h"
@@ -140,13 +140,11 @@ bool WhisperTab::handleCommand(const std::string &type,
     }
     else if (type == "ignore")
     {
-        if (commandHandler)
-            commandHandler->handleIgnore(mNick, this);
+        Commands::ignore(mNick, this);
     }
     else if (type == "unignore")
     {
-        if (commandHandler)
-            commandHandler->handleUnignore(mNick, this);
+        Commands::unignore(mNick, this);
     }
     else
     {