diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/mbed_lib.json b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/mbed_lib.json
new file mode 100644
index 00000000000..0d9dace57ee
--- /dev/null
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/mbed_lib.json
@@ -0,0 +1,6 @@
+{
+  "name": "cy_psoc6_whd",
+  "config": {
+        "present": 1
+  }
+}
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/cy_network_buffer.c b/targets/TARGET_Cypress/TARGET_PSOC6/common/network/cy_network_buffer.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/cy_network_buffer.c
rename to targets/TARGET_Cypress/TARGET_PSOC6/common/network/cy_network_buffer.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/cy_network_buffer.h b/targets/TARGET_Cypress/TARGET_PSOC6/common/network/cy_network_buffer.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/cy_network_buffer.h
rename to targets/TARGET_Cypress/TARGET_PSOC6/common/network/cy_network_buffer.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/cybsp_wifi.c b/targets/TARGET_Cypress/TARGET_PSOC6/common/network/cybsp_wifi.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/cybsp_wifi.c
rename to targets/TARGET_Cypress/TARGET_PSOC6/common/network/cybsp_wifi.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/cybsp_wifi.h b/targets/TARGET_Cypress/TARGET_PSOC6/common/network/cybsp_wifi.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/cybsp_wifi.h
rename to targets/TARGET_Cypress/TARGET_PSOC6/common/network/cybsp_wifi.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/network/mbed_lib.json b/targets/TARGET_Cypress/TARGET_PSOC6/common/network/mbed_lib.json
new file mode 100644
index 00000000000..c65feacc8da
--- /dev/null
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/common/network/mbed_lib.json
@@ -0,0 +1,6 @@
+{
+    "name": "cy_psoc6_common_network",
+    "config": {
+          "present": 1
+    }
+}
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/mbed_overrides.c b/targets/TARGET_Cypress/TARGET_PSOC6/mbed_overrides.c
index 99a5f938717..ad64aca3db7 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/mbed_overrides.c
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/mbed_overrides.c
@@ -21,7 +21,9 @@
 #include "cyhal_hwmgr.h"
 #include "cybsp.h"
 #include "mbed_power_mgmt.h"
+#if MBED_CONF_RTOS_PRESENT
 #include "rtos_idle.h"
+#endif // MBED_CONF_RTOS_PRESENT
 #include "us_ticker_api.h"
 
 #if defined(CY_ENABLE_XIP_PROGRAM)
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6csp/abstraction/rtos/mbed_lib.json b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6csp/abstraction/rtos/mbed_lib.json
new file mode 100644
index 00000000000..ad5352e440c
--- /dev/null
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6csp/abstraction/rtos/mbed_lib.json
@@ -0,0 +1,6 @@
+{
+    "name": "cy_psoc6csp_rtos",
+    "config": {
+          "present": 1
+    }
+}