diff --git a/components/mdns/mdns.c b/components/mdns/mdns.c
index 38d67826..52d25fb7 100644
--- a/components/mdns/mdns.c
+++ b/components/mdns/mdns.c
@@ -13,9 +13,11 @@
 // limitations under the License.
 
 #include "mdns.h"
-#include "mdns_private.h"
 #include "mdns_networking.h"
+#include "mdns_private.h"
+
 #include <string.h>
+#include <stdlib.h>
 
 #ifdef MDNS_ENABLE_DEBUG
 void mdns_debug_packet(const uint8_t * data, size_t len);
diff --git a/components/mdns/mdns_console.c b/components/mdns/mdns_console.c
index 17bffa55..4ac521c9 100644
--- a/components/mdns/mdns_console.c
+++ b/components/mdns/mdns_console.c
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#ifdef MDNS_ENABLE_CONSOLE
 #include <stdio.h>
 #include <string.h>
 #include "esp_console.h"
@@ -1057,4 +1058,4 @@ void mdns_console_register()
     register_mdns_query_ip();
     register_mdns_query_svc();
 }
-
+#endif
diff --git a/components/mdns/mdns_networking.c b/components/mdns/mdns_networking.c
index 4e64e36c..6f8f7e19 100644
--- a/components/mdns/mdns_networking.c
+++ b/components/mdns/mdns_networking.c
@@ -4,6 +4,7 @@
  * 
  */
 #include <string.h>
+#include <stdlib.h>
 #include "mdns_networking.h"
 
 
diff --git a/components/mdns/private_include/mdns_networking.h b/components/mdns/private_include/mdns_networking.h
index 5b56f806..6e7f80ea 100644
--- a/components/mdns/private_include/mdns_networking.h
+++ b/components/mdns/private_include/mdns_networking.h
@@ -5,8 +5,6 @@
  * MDNS Server Networking -- private include
  * 
  */
-#include "mdns.h"
-#include "mdns_private.h"
 #include "sdkconfig.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/queue.h"
@@ -21,7 +19,8 @@
 #include "esp_system.h"
 #include "esp_timer.h"
 #include "esp_event_loop.h"
-
+#include "mdns.h"
+#include "mdns_private.h"
 
 /**
  * @brief  Queue RX packet action