From 96fc4539d15116bbe658e267c56c2fc07922b013 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Thu, 14 Sep 2023 10:20:05 -0400
Subject: [PATCH] Fix CHIPConfig.h not including InetConfig.h. (#29223)

* Fix CHIPConfig.h not including InetConfig.h.

We had various things that were testing config bits that InetConfig.h would pull
in that never actually included InetConfig.h, because CHIPConfig.h did not
include it.

* Stop including inet things from CHIPCore.h.
---
 src/lib/core/BUILD.gn     | 1 +
 src/lib/core/CHIPConfig.h | 4 ++--
 src/lib/core/CHIPCore.h   | 8 --------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/lib/core/BUILD.gn b/src/lib/core/BUILD.gn
index 5a08f7d1935a23..60f56af7e5850b 100644
--- a/src/lib/core/BUILD.gn
+++ b/src/lib/core/BUILD.gn
@@ -75,6 +75,7 @@ source_set("chip_config_header") {
   public_deps = [
     ":chip_buildconfig",
     "${chip_root}/src/ble:ble_config_header",
+    "${chip_root}/src/inet:inet_config_header",
     "${chip_root}/src/system:system_config_header",
   ]
 
diff --git a/src/lib/core/CHIPConfig.h b/src/lib/core/CHIPConfig.h
index 14453c98a02d73..59a6e8252356bf 100644
--- a/src/lib/core/CHIPConfig.h
+++ b/src/lib/core/CHIPConfig.h
@@ -42,8 +42,8 @@
 #include <ble/BleConfig.h>
 #include <system/SystemConfig.h>
 
-/* COMING SOON: making the INET Layer optional entails making this inclusion optional. */
-// #include "InetConfig.h"
+#include <inet/InetConfig.h>
+
 /*
 #if INET_CONFIG_ENABLE_TCP_ENDPOINT && INET_TCP_IDLE_CHECK_INTERVAL <= 0
 #error "chip SDK requires INET_TCP_IDLE_CHECK_INTERVAL > 0"
diff --git a/src/lib/core/CHIPCore.h b/src/lib/core/CHIPCore.h
index 332978d881b2ca..bac6e473f39d43 100644
--- a/src/lib/core/CHIPCore.h
+++ b/src/lib/core/CHIPCore.h
@@ -31,14 +31,6 @@
 
 #include <ble/BleConfig.h>
 
-#if INET_CONFIG_ENABLE_TCP_ENDPOINT
-#include <inet/TCPEndPoint.h>
-#endif // INET_CONFIG_ENABLE_TCP_ENDPOINT
-
-#if INET_CONFIG_ENABLE_UDP_ENDPOINT
-#include <inet/UDPEndPoint.h>
-#endif // INET_CONFIG_ENABLE_UDP_ENDPOINT
-
 #if CONFIG_NETWORK_LAYER_BLE
 #include <ble/BleLayer.h>
 #endif // CONFIG_NETWORK_LAYER_BLE