diff --git a/esp-link/cgioptiboot.c b/esp-link/cgioptiboot.c
index 831b74b..dbec07c 100644
--- a/esp-link/cgioptiboot.c
+++ b/esp-link/cgioptiboot.c
@@ -8,7 +8,6 @@
 #include "uart.h"
 #include "stk500.h"
 #include "serbridge.h"
-#include "mqtt_cmd.h"
 #include "serled.h"
 
 #define INIT_DELAY     150   // wait this many millisecs before sending anything
diff --git a/esp-link/cgiservices.c b/esp-link/cgiservices.c
index ef76287..96624b5 100644
--- a/esp-link/cgiservices.c
+++ b/esp-link/cgiservices.c
@@ -1,4 +1,5 @@
 #include <esp8266.h>
+#include "cmd.h"
 #include "cgiwifi.h"
 #include "cgi.h"
 #include "config.h"
diff --git a/esp-link/cgiwifi.c b/esp-link/cgiwifi.c
index 5078249..9a1fc42 100644
--- a/esp-link/cgiwifi.c
+++ b/esp-link/cgiwifi.c
@@ -13,7 +13,9 @@ Cgi/template routines for the /wifi url.
  * ----------------------------------------------------------------------------
  */
 
+
 #include <esp8266.h>
+#include "cmd.h"
 #include "cgiwifi.h"
 #include "cgi.h"
 #include "status.h"
@@ -34,7 +36,7 @@ bool mdns_started = false;
 // ===== wifi status change callbacks
 static WifiStateChangeCb wifi_state_change_cb[4];
 
-// Temp store for new staion config
+// Temp store for new station config
 struct station_config stconf;
 
 // Temp store for new ap config
diff --git a/esp-link/main.c b/esp-link/main.c
index 74e96f1..1169b1d 100644
--- a/esp-link/main.c
+++ b/esp-link/main.c
@@ -13,6 +13,7 @@
 #include "httpd.h"
 #include "httpdespfs.h"
 #include "cgi.h"
+#include "cmd.h"
 #include "cgiwifi.h"
 #include "cgipins.h"
 #include "cgitcp.h"
diff --git a/esp-link/mqtt_client.c b/esp-link/mqtt_client.c
index 39325d7..682dfee 100644
--- a/esp-link/mqtt_client.c
+++ b/esp-link/mqtt_client.c
@@ -4,6 +4,8 @@
 #include "config.h"
 #include "mqtt.h"
 
+#include "cmd/cmd.h"
+
 #ifdef MQTTCLIENT_DBG
 #define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0)
 #else
diff --git a/esp-link/status.c b/esp-link/status.c
index 6905850..a5ca8c1 100644
--- a/esp-link/status.c
+++ b/esp-link/status.c
@@ -3,6 +3,7 @@
 #include <esp8266.h>
 #include "config.h"
 #include "serled.h"
+#include "cmd.h"
 #include "cgiwifi.h"
 
 #ifdef MQTT