From 58bf2186f72410b78e6ea376184817bd631604de Mon Sep 17 00:00:00 2001
From: Sudeep Mohanty <sudeep.mohanty@espressif.com>
Date: Wed, 12 Jan 2022 12:23:47 +0530
Subject: [PATCH] esp_hw_support/esp_system: Re-evaluate header inclusions and
 include directories

This commit updates the visibility of various header files and cleans up
some unnecessary inclusions. Also, this commit removes certain header
include paths which were maintained for backward compatibility.


* Original commit: espressif/esp-idf@a9fda54d39d1321005c3bc9b3cc268d0b7e9f052
---
 components/mdns/mdns.c                           | 2 ++
 components/mdns/test_afl_fuzz_host/esp32_mock.h  | 2 +-
 examples/protocols/mdns/main/mdns_example_main.c | 2 +-
 tools/test_apps/protocols/mdns/main/main.c       | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/mdns/mdns.c b/components/mdns/mdns.c
index 44df1db97..8b47b3c35 100644
--- a/components/mdns/mdns.c
+++ b/components/mdns/mdns.c
@@ -15,6 +15,8 @@
 #include "mdns.h"
 #include "mdns_private.h"
 #include "mdns_networking.h"
+#include "esp_log.h"
+#include "esp_random.h"
 
 #ifdef MDNS_ENABLE_DEBUG
 void mdns_debug_packet(const uint8_t * data, size_t len);
diff --git a/components/mdns/test_afl_fuzz_host/esp32_mock.h b/components/mdns/test_afl_fuzz_host/esp32_mock.h
index b5187cb0c..8afe01fba 100644
--- a/components/mdns/test_afl_fuzz_host/esp32_mock.h
+++ b/components/mdns/test_afl_fuzz_host/esp32_mock.h
@@ -52,7 +52,7 @@
 #define ESP_LOGV(a,b,c,d)
 
 #define LWIP_HDR_PBUF_H
-#define __ESP_SYSTEM_H__
+#define __ESP_RANDOM_H__
 #define INC_TASK_H
 
 #define pdMS_TO_TICKS(a) a
diff --git a/examples/protocols/mdns/main/mdns_example_main.c b/examples/protocols/mdns/main/mdns_example_main.c
index 0b5e96245..c1db88ba0 100644
--- a/examples/protocols/mdns/main/mdns_example_main.c
+++ b/examples/protocols/mdns/main/mdns_example_main.c
@@ -10,7 +10,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "esp_netif_ip_addr.h"
-#include "esp_system.h"
+#include "esp_mac.h"
 #include "esp_event.h"
 #include "esp_log.h"
 #include "nvs_flash.h"
diff --git a/tools/test_apps/protocols/mdns/main/main.c b/tools/test_apps/protocols/mdns/main/main.c
index 4be8ec494..0a160aee2 100644
--- a/tools/test_apps/protocols/mdns/main/main.c
+++ b/tools/test_apps/protocols/mdns/main/main.c
@@ -5,7 +5,7 @@
  */
 #include <stdio.h>
 #include <string.h>
-#include "esp_system.h"
+#include "esp_mac.h"
 #include "nvs_flash.h"
 #include "esp_event.h"
 #include "esp_netif.h"