diff --git a/components/esp_netif/include/esp_netif_defaults.h b/components/esp_netif/include/esp_netif_defaults.h
index caa5a8a00..d03c45965 100644
--- a/components/esp_netif/include/esp_netif_defaults.h
+++ b/components/esp_netif/include/esp_netif_defaults.h
@@ -29,8 +29,8 @@ extern "C" {
 #define ESP_NETIF_DEFAULT_ETH()                  \
     {                                            \
         .base = ESP_NETIF_BASE_DEFAULT_ETH,      \
+        .driver = NULL,                          \
         .stack = ESP_NETIF_NETSTACK_DEFAULT_ETH, \
-        .driver = NULL,  \
     }
 
 /**
@@ -39,8 +39,8 @@ extern "C" {
 #define ESP_NETIF_DEFAULT_WIFI_AP()                  \
 {                                                    \
         .base = ESP_NETIF_BASE_DEFAULT_WIFI_AP,      \
+        .driver = NULL,                              \
         .stack = ESP_NETIF_NETSTACK_DEFAULT_WIFI_AP, \
-        .driver = NULL,  \
     }
 
 /**
@@ -49,8 +49,8 @@ extern "C" {
 #define ESP_NETIF_DEFAULT_WIFI_STA()                  \
     {                                                 \
         .base = ESP_NETIF_BASE_DEFAULT_WIFI_STA,      \
+        .driver = NULL,                               \
         .stack = ESP_NETIF_NETSTACK_DEFAULT_WIFI_STA, \
-        .driver = NULL,  \
     }
 
 /**
@@ -59,8 +59,8 @@ extern "C" {
 #define ESP_NETIF_DEFAULT_PPP()                       \
     {                                                 \
         .base = ESP_NETIF_BASE_DEFAULT_PPP,           \
+        .driver = NULL,                               \
         .stack = ESP_NETIF_NETSTACK_DEFAULT_PPP,      \
-        .driver = NULL,     \
     }
 /**
  * @brief  Default base config (esp-netif inherent) of WIFI STA
diff --git a/components/esp_wifi/include/esp_wifi_default.h b/components/esp_wifi/include/esp_wifi_default.h
index fc6af5441..614a4ff9f 100644
--- a/components/esp_wifi/include/esp_wifi_default.h
+++ b/components/esp_wifi/include/esp_wifi_default.h
@@ -15,6 +15,10 @@
 #ifndef _ESP_WIFI_DEFAULT_H
 #define _ESP_WIFI_DEFAULT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Attaches wifi station interface to supplied netif
  *
@@ -95,4 +99,8 @@ esp_netif_t* esp_netif_create_default_wifi_sta(void);
  */
 esp_err_t esp_netif_create_default_wifi_mesh_netifs(esp_netif_t **p_netif_sta, esp_netif_t **p_netif_ap);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //_ESP_WIFI_DEFAULT_H
diff --git a/components/esp_wifi/include/esp_wifi_netif.h b/components/esp_wifi/include/esp_wifi_netif.h
index 14de99043..203b63c61 100644
--- a/components/esp_wifi/include/esp_wifi_netif.h
+++ b/components/esp_wifi/include/esp_wifi_netif.h
@@ -15,6 +15,10 @@
 #ifndef _ESP_WIFI_NETIF_H
 #define _ESP_WIFI_NETIF_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Number of WiFi interfaces used by wifi-netif abstraction
  */
@@ -80,5 +84,8 @@ bool esp_wifi_is_if_ready_when_started(wifi_netif_driver_t ifx);
  */
 esp_err_t esp_wifi_register_if_rxcb(wifi_netif_driver_t ifx, esp_netif_receive_t fn, void * arg);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif //_ESP_WIFI_NETIF_H
\ No newline at end of file