Improve includes

MaJerle · Sep 16, 2022 · dd597f7 · dd597f7
1 parent af7ed5f
commit dd597f7
Show file tree

Hide file tree

Showing 36 changed files with 47 additions and 33 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -23,7 +23,13 @@
         "lwesp_ping.h": "c",
         "lwesp_threads.h": "c",
         "lwesp_int.h": "c",
-        "lwesp_sta.h": "c"
+        "lwesp_sta.h": "c",
+        "lwesp_mqtt_client_api.h": "c",
+        "lwesp_cayenne.h": "c",
+        "lwesp_http_server.h": "c",
+        "lwesp_apps.h": "c",
+        "lwesp_mqtt_client.h": "c",
+        "lwesp_mqtt_client_evt.h": "c"
     },
     "esbonio.sphinx.confDir": ""
 }
diff --git a/lwesp/src/apps/mqtt/lwesp_mqtt_client.c b/lwesp/src/apps/mqtt/lwesp_mqtt_client.c
@@ -32,8 +32,7 @@
  * Version:         v1.1.2-dev
  */
 #include "lwesp/apps/lwesp_mqtt_client.h"
-#include "lwesp/lwesp_mem.h"
-#include "lwesp/lwesp_pbuf.h"
+#include "lwesp/lwesp.h"
 
 /**
  * \brief           MQTT client connection

diff --git a/lwesp/src/apps/mqtt/lwesp_mqtt_client_api.c b/lwesp/src/apps/mqtt/lwesp_mqtt_client_api.c
@@ -32,7 +32,7 @@
  * Version:         v1.1.2-dev
  */
 #include "lwesp/apps/lwesp_mqtt_client_api.h"
-#include "lwesp/lwesp_mem.h"
+#include "lwesp/lwesp_private.h"
 
 /* Tracing debug message */
 #define LWESP_CFG_DBG_MQTT_API_TRACE         (LWESP_CFG_DBG_MQTT_API | LWESP_DBG_TYPE_TRACE)

diff --git a/lwesp/src/include/lwesp/apps/lwesp_apps.h b/lwesp/src/include/lwesp/apps/lwesp_apps.h
@@ -34,6 +34,7 @@
 #ifndef LWESP_HDR_APPS_H
 #define LWESP_HDR_APPS_H
 
+#include "lwesp/lwesp_types.h"
 #include "lwesp/lwesp.h"
 
 #ifdef __cplusplus

diff --git a/lwesp/src/include/lwesp/apps/lwesp_cayenne_evt.h b/lwesp/src/include/lwesp/apps/lwesp_cayenne_evt.h
@@ -35,7 +35,7 @@
 #define LWESP_HDR_APP_CAYENNE_EVT_H
 
 #include "lwesp/apps/lwesp_cayenne.h"
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/apps/lwesp_http_server.h b/lwesp/src/include/lwesp/apps/lwesp_http_server.h
@@ -35,6 +35,7 @@
 #define LWESP_HDR_HTTP_SERVER_H
 
 #include "lwesp/apps/lwesp_apps.h"
+#include "lwesp/lwesp.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/apps/lwesp_http_server_fs.h b/lwesp/src/include/lwesp/apps/lwesp_http_server_fs.h
@@ -35,6 +35,7 @@
 #define LWESP_HDR_HTTP_SERVER_FS_H
 
 #include "lwesp/apps/lwesp_http_server.h"
+#include "lwesp/lwesp.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/apps/lwesp_mqtt_client.h b/lwesp/src/include/lwesp/apps/lwesp_mqtt_client.h
@@ -35,7 +35,7 @@
 #define LWESP_HDR_APP_MQTT_CLIENT_H
 
 #include "lwesp/apps/lwesp_mqtt_client_evt.h"
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_includes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_ap.h b/lwesp/src/include/lwesp/lwesp_ap.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_AP_H
 #define LWESP_HDR_AP_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_buff.h b/lwesp/src/include/lwesp/lwesp_buff.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_BUFF_H
 #define LWESP_HDR_BUFF_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_cli.h b/lwesp/src/include/lwesp/lwesp_cli.h
@@ -32,7 +32,7 @@
 #ifndef LWESP_HDR_CLI_H
 #define LWESP_HDR_CLI_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_conn.h b/lwesp/src/include/lwesp/lwesp_conn.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_CONN_H
 #define LWESP_HDR_CONN_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_dhcp.h b/lwesp/src/include/lwesp/lwesp_dhcp.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_DHCP_H
 #define LWESP_HDR_DHCP_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_dns.h b/lwesp/src/include/lwesp/lwesp_dns.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_DNS_H
 #define LWESP_HDR_DNS_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_evt.h b/lwesp/src/include/lwesp/lwesp_evt.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_EVT_H
 #define LWESP_HDR_EVT_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_hostname.h b/lwesp/src/include/lwesp/lwesp_hostname.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_HOSTNAME_H
 #define LWESP_HDR_HOSTNAME_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_includes.h b/lwesp/src/include/lwesp/lwesp_includes.h
@@ -43,6 +43,7 @@
 #include "lwesp/lwesp_evt.h"
 #include "lwesp/lwesp_input.h"
 #include "lwesp/lwesp_pbuf.h"
+#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_server.h"
 #include "lwesp/lwesp_utils.h"
 #include "system/lwesp_sys.h"

diff --git a/lwesp/src/include/lwesp/lwesp_input.h b/lwesp/src/include/lwesp/lwesp_input.h
@@ -35,7 +35,7 @@
 #define LWESP_HDR_INPUT_H
 
 #include <string.h>
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_mdns.h b/lwesp/src/include/lwesp/lwesp_mdns.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_MDNS_H
 #define LWESP_HDR_MDNS_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_mem.h b/lwesp/src/include/lwesp/lwesp_mem.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_MEM_H
 #define LWESP_HDR_MEM_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_netconn.h b/lwesp/src/include/lwesp/lwesp_netconn.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_NETCONN_H
 #define LWESP_HDR_NETCONN_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_parser.h b/lwesp/src/include/lwesp/lwesp_parser.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_PARSER_H
 #define LWESP_HDR_PARSER_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 #include "lwesp/lwesp_private.h"
 
 #ifdef __cplusplus

diff --git a/lwesp/src/include/lwesp/lwesp_pbuf.h b/lwesp/src/include/lwesp/lwesp_pbuf.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_PBUF_H
 #define LWESP_HDR_PBUF_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_ping.h b/lwesp/src/include/lwesp/lwesp_ping.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_PING_H
 #define LWESP_HDR_PING_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_private.h b/lwesp/src/include/lwesp/lwesp_private.h
@@ -34,10 +34,15 @@
 #ifndef LWESP_HDR_PRIV_H
 #define LWESP_HDR_PRIV_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_opt.h"
+#include "lwesp/lwesp_types.h"
 #include "lwesp/lwesp_debug.h"
+#include "lwesp/lwesp_buff.h"
 #include "lwesp/lwesp_mem.h"
+#include "lwesp/lwesp.h"
 #include "lwesp/lwesp_timeout.h"
+#include "lwesp/lwesp_utils.h"
+#include "lwesp/lwesp_includes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_server.h b/lwesp/src/include/lwesp/lwesp_server.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_SERVER_H
 #define LWESP_HDR_SERVER_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_smart.h b/lwesp/src/include/lwesp/lwesp_smart.h
@@ -35,7 +35,7 @@
 #ifndef LWESP_HDR_SMART_H
 #define LWESP_HDR_SMART_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_sntp.h b/lwesp/src/include/lwesp/lwesp_sntp.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_SNTP_H
 #define LWESP_HDR_SNTP_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_sta.h b/lwesp/src/include/lwesp/lwesp_sta.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_STA_H
 #define LWESP_HDR_STA_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_threads.h b/lwesp/src/include/lwesp/lwesp_threads.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_THREADS_H
 #define LWESP_HDR_THREADS_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_timeout.h b/lwesp/src/include/lwesp/lwesp_timeout.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_TIMEOUT_H
 #define LWESP_HDR_TIMEOUT_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_unicode.h b/lwesp/src/include/lwesp/lwesp_unicode.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_UNICODE_H
 #define LWESP_HDR_UNICODE_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_utils.h b/lwesp/src/include/lwesp/lwesp_utils.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_UTILS_H
 #define LWESP_HDR_UTILS_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_webserver.h b/lwesp/src/include/lwesp/lwesp_webserver.h
@@ -35,7 +35,7 @@
 #ifndef LWESP_HDR_WEBSERVER_H
 #define LWESP_HDR_WEBSERVER_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_wps.h b/lwesp/src/include/lwesp/lwesp_wps.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_WPS_H
 #define LWESP_HDR_WPS_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/system/lwesp_ll.h b/lwesp/src/include/system/lwesp_ll.h
@@ -34,7 +34,7 @@
 #ifndef LWESP_HDR_LL_H
 #define LWESP_HDR_LL_H
 
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {