diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
index 267b28027a..3f84e2e953 100644
--- a/connectivity/CMakeLists.txt
+++ b/connectivity/CMakeLists.txt
@@ -6,44 +6,21 @@ add_library(mbed-802.15.4-rf INTERFACE)
 add_library(mbed-ble INTERFACE)
 add_library(mbed-ble-cordio INTERFACE)
 add_library(mbed-ble-cordio_ll INTERFACE)
-add_library(mbed-cellular INTERFACE)
-add_library(mbed-coap INTERFACE)
 add_library(mbed-emac INTERFACE)
 add_library(mbed-lorawan INTERFACE)
-add_library(mbed-lwipstack INTERFACE)
 add_library(mbed-mbedtls STATIC EXCLUDE_FROM_ALL)
-add_library(mbed-nanostack INTERFACE)
-add_library(mbed-nanostack-coap_service INTERFACE)
-add_library(mbed-nanostack-mbed_mesh_api INTERFACE)
-add_library(mbed-nanostack-hal_mbed_cmsis_rtos INTERFACE)
-add_library(mbed-nanostack-sal_stack INTERFACE)
-add_library(mbed-nanostack-sal_stack-event_loop INTERFACE)
-add_library(mbed-nanostack-libservice INTERFACE)
-add_library(mbed-netsocket INTERFACE)
+
 add_library(mbed-nfc INTERFACE)
 add_library(mbed-ppp INTERFACE)
 add_library(mbed-wifi INTERFACE)
 
-if(MBED_OS_ENABLE_TESTS)
-    # Add these subdirectories for tests
-    add_subdirectory(cellular)
-    add_subdirectory(drivers)
-    add_subdirectory(FEATURE_BLE)
-    add_subdirectory(libraries)
-    add_subdirectory(lorawan)
-    add_subdirectory(mbedtls)
-    add_subdirectory(netsocket)
-    add_subdirectory(nfc)
-else()
-    # The directories below contain optional target libraries
-    add_subdirectory(FEATURE_BLE EXCLUDE_FROM_ALL)
-    add_subdirectory(cellular EXCLUDE_FROM_ALL)
-    add_subdirectory(drivers EXCLUDE_FROM_ALL)
-    add_subdirectory(libraries EXCLUDE_FROM_ALL)
-    add_subdirectory(lorawan EXCLUDE_FROM_ALL)
-    add_subdirectory(lwipstack EXCLUDE_FROM_ALL)
-    add_subdirectory(mbedtls EXCLUDE_FROM_ALL)
-    add_subdirectory(nanostack EXCLUDE_FROM_ALL)
-    add_subdirectory(netsocket EXCLUDE_FROM_ALL)
-    add_subdirectory(nfc EXCLUDE_FROM_ALL)
-endif()
+add_subdirectory(nanostack)
+add_subdirectory(cellular)
+add_subdirectory(drivers)
+add_subdirectory(FEATURE_BLE)
+add_subdirectory(libraries)
+add_subdirectory(lorawan)
+add_subdirectory(lwipstack)
+add_subdirectory(mbedtls)
+add_subdirectory(netsocket)
+add_subdirectory(nfc)
\ No newline at end of file
diff --git a/connectivity/cellular/CMakeLists.txt b/connectivity/cellular/CMakeLists.txt
index 757ac906e2..4198fecb05 100644
--- a/connectivity/cellular/CMakeLists.txt
+++ b/connectivity/cellular/CMakeLists.txt
@@ -9,10 +9,12 @@ if(MBED_OS_ENABLE_TESTS)
     endif()
 endif()
 
+add_library(mbed-cellular STATIC EXCLUDE_FROM_ALL)
+
 add_subdirectory(source/framework)
 
 target_include_directories(mbed-cellular
-    INTERFACE
+    PUBLIC
         .
         ./include
         ./include/cellular
@@ -24,12 +26,17 @@ target_include_directories(mbed-cellular
 )
 
 target_compile_definitions(mbed-cellular
-    INTERFACE
+    PUBLIC
         MBED_CONF_CELLULAR_PRESENT=1
 )
 
+target_sources(mbed-cellular
+    PUBLIC
+        source/CellularNonIPSocket.cpp
+)
+
 target_link_libraries(mbed-cellular
-    INTERFACE
+    PUBLIC
         mbed-netsocket
         mbed-core-flags
 )
diff --git a/connectivity/netsocket/include/netsocket/CellularNonIPSocket.h b/connectivity/cellular/include/CellularNonIPSocket.h
similarity index 100%
rename from connectivity/netsocket/include/netsocket/CellularNonIPSocket.h
rename to connectivity/cellular/include/CellularNonIPSocket.h
diff --git a/connectivity/netsocket/source/CellularNonIPSocket.cpp b/connectivity/cellular/source/CellularNonIPSocket.cpp
similarity index 99%
rename from connectivity/netsocket/source/CellularNonIPSocket.cpp
rename to connectivity/cellular/source/CellularNonIPSocket.cpp
index 11a0786a3e..71e7919a10 100644
--- a/connectivity/netsocket/source/CellularNonIPSocket.cpp
+++ b/connectivity/cellular/source/CellularNonIPSocket.cpp
@@ -19,7 +19,7 @@
 #if MBED_CONF_CELLULAR_PRESENT
 
 #include "platform/Callback.h"
-#include "netsocket/CellularNonIPSocket.h"
+#include "CellularNonIPSocket.h"
 #include <stdio.h>
 
 using namespace mbed;
diff --git a/connectivity/cellular/source/framework/AT/CMakeLists.txt b/connectivity/cellular/source/framework/AT/CMakeLists.txt
index f9bfcb1889..ad34d4a9cc 100644
--- a/connectivity/cellular/source/framework/AT/CMakeLists.txt
+++ b/connectivity/cellular/source/framework/AT/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_sources(mbed-cellular
-    INTERFACE
+    PRIVATE
         AT_CellularContext.cpp
         AT_CellularDevice.cpp
         AT_CellularInformation.cpp
diff --git a/connectivity/cellular/source/framework/common/CMakeLists.txt b/connectivity/cellular/source/framework/common/CMakeLists.txt
index 2edcac94cf..0f4c3a8395 100644
--- a/connectivity/cellular/source/framework/common/CMakeLists.txt
+++ b/connectivity/cellular/source/framework/common/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_sources(mbed-cellular
-    INTERFACE
+    PRIVATE
         APN_db.cpp
         CellularLog.cpp
         CellularUtil.cpp
diff --git a/connectivity/cellular/source/framework/device/CMakeLists.txt b/connectivity/cellular/source/framework/device/CMakeLists.txt
index 289337f156..ede313e94a 100644
--- a/connectivity/cellular/source/framework/device/CMakeLists.txt
+++ b/connectivity/cellular/source/framework/device/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_sources(mbed-cellular
-    INTERFACE
+    PRIVATE
         ATHandler.cpp
         CellularContext.cpp
         CellularDevice.cpp
diff --git a/connectivity/libraries/mbed-coap/CMakeLists.txt b/connectivity/libraries/mbed-coap/CMakeLists.txt
index 71bfd40077..2c503c9140 100644
--- a/connectivity/libraries/mbed-coap/CMakeLists.txt
+++ b/connectivity/libraries/mbed-coap/CMakeLists.txt
@@ -1,15 +1,17 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-coap STATIC EXCLUDE_FROM_ALL)
+
 target_include_directories(mbed-coap
-    INTERFACE
+    PUBLIC
         .
         ./mbed-coap
         ./source/include
 )
 
 target_sources(mbed-coap
-    INTERFACE
+    PRIVATE
         source/sn_coap_builder.c
         source/sn_coap_header_check.c
         source/sn_coap_parser.c
@@ -17,6 +19,13 @@ target_sources(mbed-coap
 )
 
 target_compile_definitions(mbed-coap
-    INTERFACE
+    PUBLIC
         MBED_CONF_COAP_PRESENT=1
 )
+
+target_link_libraries(mbed-coap
+    PUBLIC
+        mbed-nanostack-libservice
+        mbed-core-flags
+        mbed-randlib
+)
diff --git a/connectivity/libraries/nanostack-libservice/CMakeLists.txt b/connectivity/libraries/nanostack-libservice/CMakeLists.txt
index 55026a194c..24790c11ca 100644
--- a/connectivity/libraries/nanostack-libservice/CMakeLists.txt
+++ b/connectivity/libraries/nanostack-libservice/CMakeLists.txt
@@ -1,15 +1,17 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-nanostack-libservice STATIC EXCLUDE_FROM_ALL)
+
 target_include_directories(mbed-nanostack-libservice
-    INTERFACE
+    PUBLIC
         .
         ./mbed-client-libservice
         ./mbed-client-libservice/platform
 )
 
 target_sources(mbed-nanostack-libservice
-    INTERFACE
+    PRIVATE
         source/IPv6_fcf_lib/ip_fsc.c
         source/libList/ns_list.c
         source/libip4string/ip4tos.c
diff --git a/connectivity/lwipstack/CMakeLists.txt b/connectivity/lwipstack/CMakeLists.txt
index 96c9b12155..8c087d84eb 100644
--- a/connectivity/lwipstack/CMakeLists.txt
+++ b/connectivity/lwipstack/CMakeLists.txt
@@ -1,8 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-lwipstack STATIC EXCLUDE_FROM_ALL)
+
 target_include_directories(mbed-lwipstack
-    INTERFACE
+    PUBLIC
         .
         ./include
         ./include/lwipstack
@@ -13,7 +15,7 @@ target_include_directories(mbed-lwipstack
 )
 
 target_sources(mbed-lwipstack
-    INTERFACE
+    PRIVATE
         lwip/src/api/lwip_api_lib.c
         lwip/src/api/lwip_api_msg.c
         lwip/src/api/lwip_err.c
@@ -88,13 +90,15 @@ target_sources(mbed-lwipstack
 )
 
 target_compile_definitions(mbed-lwipstack
-    INTERFACE
+    PUBLIC
         MBED_CONF_LWIPSTACK_PRESENT=1
 )
 
 target_link_libraries(mbed-lwipstack
-    INTERFACE
+    PUBLIC
         mbed-netsocket
         mbed-ppp
         mbed-randlib
+    PRIVATE
+        mbed-rtos-flags
 )
diff --git a/connectivity/nanostack/CMakeLists.txt b/connectivity/nanostack/CMakeLists.txt
index e49852b64c..9ff2685025 100644
--- a/connectivity/nanostack/CMakeLists.txt
+++ b/connectivity/nanostack/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-nanostack STATIC EXCLUDE_FROM_ALL)
+
 add_subdirectory(coap-service)
 add_subdirectory(mbed-mesh-api)
 add_subdirectory(nanostack-hal-mbed-cmsis-rtos)
@@ -8,24 +10,24 @@ add_subdirectory(sal-stack-nanostack)
 add_subdirectory(sal-stack-nanostack-eventloop)
 
 target_include_directories(mbed-nanostack
-    INTERFACE
+    PUBLIC
         .
         ./include
         ./include/nanostack-interface
 )
 
 target_sources(mbed-nanostack
-    INTERFACE
+    PRIVATE
         source/Nanostack.cpp
 )
 
 target_compile_definitions(mbed-nanostack
-    INTERFACE
+    PUBLIC
         MBED_CONF_NANOSTACK_PRESENT=1
 )
 
 target_link_libraries(mbed-nanostack
-    INTERFACE
+    PUBLIC
         mbed-nanostack-mbed_mesh_api
         mbed-nanostack-sal_stack-event_loop
         mbed-nanostack-sal_stack
diff --git a/connectivity/nanostack/coap-service/CMakeLists.txt b/connectivity/nanostack/coap-service/CMakeLists.txt
index 277e79c632..53902ceed4 100644
--- a/connectivity/nanostack/coap-service/CMakeLists.txt
+++ b/connectivity/nanostack/coap-service/CMakeLists.txt
@@ -1,22 +1,29 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-nanostack-coap_service STATIC EXCLUDE_FROM_ALL)
+
 target_include_directories(mbed-nanostack-coap_service
-    INTERFACE
+    PUBLIC
         .
         ./coap-service
         ./source/include
 )
 
 target_sources(mbed-nanostack-coap_service
-    INTERFACE
+    PRIVATE
         source/coap_connection_handler.c
         source/coap_message_handler.c
         source/coap_security_handler.c
         source/coap_service_api.c
 )
 
-target_link_libraries(mbed-nanostack
-    INTERFACE
+target_link_libraries(mbed-nanostack-coap_service
+    PUBLIC
+        mbed-nanostack-libservice
+        mbed-nanostack-sal_stack
         mbed-coap
+        mbed-nanostack-sal_stack-event_loop
+        mbed-randlib
+        mbed-mbedtls
 )
diff --git a/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt b/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt
index d420ced17d..e3d7169a1a 100644
--- a/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt
+++ b/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt
@@ -1,15 +1,18 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-nanostack-mbed_mesh_api STATIC EXCLUDE_FROM_ALL)
+
 target_include_directories(mbed-nanostack-mbed_mesh_api
-    INTERFACE
+    PUBLIC
         .
         ./mbed-mesh-api
         ./source/include
-)
+        ../include/nanostack-interface
+    )
 
 target_sources(mbed-nanostack-mbed_mesh_api
-    INTERFACE
+    PRIVATE
         source/CallbackHandler.cpp
         source/LoWPANNDInterface.cpp
         source/MeshInterfaceNanostack.cpp
@@ -27,7 +30,12 @@ target_sources(mbed-nanostack-mbed_mesh_api
         source/wisun_tasklet.c
 )
 
-target_link_libraries(mbed-nanostack
-    INTERFACE
+target_link_libraries(mbed-nanostack-mbed_mesh_api
+    PUBLIC
         mbed-nanostack-hal_mbed_cmsis_rtos
+        mbed-nanostack-sal_stack
+        mbed-netsocket
+        mbed-core-flags
+    PRIVATE
+        mbed-rtos-flags
 )
diff --git a/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt
index 0b948fd62f..816622a62e 100644
--- a/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt
+++ b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt
@@ -1,13 +1,15 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-nanostack-hal_mbed_cmsis_rtos STATIC EXCLUDE_FROM_ALL)
+
 target_include_directories(mbed-nanostack-hal_mbed_cmsis_rtos
-    INTERFACE
+    PUBLIC
         .
 )
 
 target_sources(mbed-nanostack-hal_mbed_cmsis_rtos
-    INTERFACE
+    PRIVATE
         arm_hal_fhss_timer.cpp
         arm_hal_interrupt.c
         arm_hal_random.c
@@ -20,3 +22,10 @@ target_sources(mbed-nanostack-hal_mbed_cmsis_rtos
 
         nvm/nvm_ram.c
 )
+
+target_link_libraries(mbed-nanostack-hal_mbed_cmsis_rtos
+    PUBLIC
+        mbed-core-flags
+    PRIVATE
+        mbed-rtos-flags
+)
\ No newline at end of file
diff --git a/connectivity/nanostack/sal-stack-nanostack-eventloop/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack-eventloop/CMakeLists.txt
index 1e4ebae115..3320a52b32 100644
--- a/connectivity/nanostack/sal-stack-nanostack-eventloop/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack-eventloop/CMakeLists.txt
@@ -1,7 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-nanostack-sal_stack-event_loop STATIC EXCLUDE_FROM_ALL)
+
 target_include_directories(mbed-nanostack-sal_stack-event_loop
-    INTERFACE
+    PUBLIC
         .
         ./nanostack-event-loop
         ./nanostack-event-loop/platform
@@ -9,9 +11,14 @@ target_include_directories(mbed-nanostack-sal_stack-event_loop
 )
 
 target_sources(mbed-nanostack-sal_stack-event_loop
-    INTERFACE
+    PRIVATE
         source/event.c
         source/ns_timeout.c
         source/ns_timer.c
         source/system_timer.c
 )
+
+target_link_libraries(mbed-nanostack-sal_stack-event_loop
+    PUBLIC
+        mbed-core-flags
+)
\ No newline at end of file
diff --git a/connectivity/nanostack/sal-stack-nanostack/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/CMakeLists.txt
index 2cab979e90..0921a6f899 100644
--- a/connectivity/nanostack/sal-stack-nanostack/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2020-2021, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-nanostack-sal_stack STATIC EXCLUDE_FROM_ALL)
+
 add_subdirectory(source/6LoWPAN)
 add_subdirectory(source/BorderRouter)
 add_subdirectory(source/Common_Protocols)
@@ -20,14 +22,19 @@ add_subdirectory(source/libDHCPv6)
 add_subdirectory(source/libNET)
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
         ./nanostack
         ./nanostack/platform
         ./source
 )
 
-target_link_libraries(mbed-nanostack
-    INTERFACE
+target_link_libraries(mbed-nanostack-sal_stack
+    PUBLIC
+        mbed-nanostack-libservice
+        mbed-core-flags
+        mbed-nanostack-sal_stack-event_loop
+        mbed-randlib
+        mbed-mbedtls
         mbed-nanostack-coap_service
 )
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt
index ef3b50ce2c..24b9f50b96 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
         ./Bootstraps
         ./Fragmentation
@@ -16,7 +16,7 @@ target_include_directories(mbed-nanostack-sal_stack
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         adaptation_interface.c
 
         Bootstraps/Generic/network_lib.c
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt
index 3f0d5fafce..c7a34fc57d 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/CMakeLists.txt
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         border_router.c
 )
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt
index 31bcdffc22..682a479b59 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/CMakeLists.txt
@@ -2,12 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         icmpv6.c
         icmpv6_prefix.c
         icmpv6_radv.c
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt
index ae8903fe3f..6b1d1acee3 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/Core/CMakeLists.txt
@@ -2,13 +2,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
         ./include
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         buffer_dyn.c
         ns_address_internal.c
         ns_monitor.c
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt
index f62037f121..d017c8c422 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/CMakeLists.txt
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         DHCPv6_Server_service.c
 )
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt
index 1838ab0153..055a9ca001 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/CMakeLists.txt
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         dhcpv6_client_service.c
 )
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt
index 6dec6f74a7..36ab2d1602 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/MAC/CMakeLists.txt
@@ -2,14 +2,14 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
         ./IEEE802_15_4
         ./virtual_rf
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         rf_driver_storage.c
 
         IEEE802_15_4/mac_cca_threshold.c
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt
index da8a5f3d37..ccfc3688d0 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/MLE/CMakeLists.txt
@@ -2,12 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         mle.c
         mle_tlv.c
 )
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt
index 805ae78d20..f7d021243a 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/MPL/CMakeLists.txt
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         mpl.c
 )
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt
index 50445aeffe..e359797054 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/CMakeLists.txt
@@ -2,13 +2,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
         ./Include
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         protocol_core.c
         protocol_core_sleep.c
         protocol_stats.c
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt
index 98616d90be..40ce67a209 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/RPL/CMakeLists.txt
@@ -2,12 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         rpl_control.c
         rpl_data.c
         rpl_downward.c
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt
index 63aaf0653a..3baa38238c 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/Security/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
         ./Common
         ./PANA
@@ -19,7 +19,7 @@ target_include_directories(mbed-nanostack-sal_stack
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         Common/security_lib.c
 
         PANA/eap_protocol.c
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt
index 846fc8cb05..df73a13fd9 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
         ./Neighbor_cache
         ./Trickle
@@ -36,7 +36,7 @@ target_include_directories(mbed-nanostack-sal_stack
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         CCM_lib/ccm_security.c
 
         CCM_lib/mbedOS/aes_mbedtls_adapter.c
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/configs/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/configs/CMakeLists.txt
index 232128a026..2c2038ae34 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/configs/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/configs/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
         ./base
 )
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/CMakeLists.txt
index 6ef7fbb31c..2accad4752 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/CMakeLists.txt
@@ -2,12 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         ipv6_routing_table.c
         protocol_ipv6.c
 )
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt
index f922d6e437..779da3b519 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt
@@ -2,12 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         dhcp_service_api.c
         libDHCPv6.c
         libDHCPv6_server.c
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt
index 8d2a977d72..9f4c40068e 100644
--- a/connectivity/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt
+++ b/connectivity/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt
@@ -2,13 +2,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-nanostack-sal_stack
-    INTERFACE
+    PUBLIC
         .
         ./src
 )
 
 target_sources(mbed-nanostack-sal_stack
-    INTERFACE
+    PRIVATE
         src/multicast_api.c
         src/net_6lowpan_parameter_api.c
         src/net_dns.c
diff --git a/connectivity/netsocket/CMakeLists.txt b/connectivity/netsocket/CMakeLists.txt
index 5f463d33c2..ea64e969a3 100644
--- a/connectivity/netsocket/CMakeLists.txt
+++ b/connectivity/netsocket/CMakeLists.txt
@@ -9,21 +9,17 @@ if(MBED_OS_ENABLE_TESTS)
     endif()
 endif()
 
-# TODO CMake: Perhaps move this/these file(s) into connectivity/drivers/cellular
-target_sources(mbed-cellular
-    INTERFACE
-        source/CellularNonIPSocket.cpp
-)
+add_library(mbed-netsocket STATIC EXCLUDE_FROM_ALL)
 
 target_include_directories(mbed-netsocket
-    INTERFACE
+    PUBLIC
         .
         ./include
         ./include/netsocket
 )
 
 target_sources(mbed-netsocket
-    INTERFACE
+    PRIVATE
         source/DTLSSocket.cpp
         source/DTLSSocketWrapper.cpp
         source/EMACInterface.cpp
@@ -49,26 +45,27 @@ target_sources(mbed-netsocket
 )
 
 target_compile_definitions(mbed-netsocket
-    INTERFACE
+    PUBLIC
         MBED_CONF_NSAPI_PRESENT=1
 )
 
 target_link_libraries(mbed-netsocket
-    INTERFACE
+    PUBLIC
         mbed-mbedtls
         mbed-lwipstack
         mbed-events
+        mbed-core-flags
 )
 
 if("DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)
     target_link_libraries(mbed-netsocket
-        INTERFACE
+        PUBLIC
             mbed-emac
     )
 endif()
 
 target_link_libraries(mbed-netsocket
-    INTERFACE
+    PUBLIC
         mbed-wifi
         mbed-cellular
         mbed-nanostack-libservice
diff --git a/events/CMakeLists.txt b/events/CMakeLists.txt
index 99feb99e07..23211506ad 100644
--- a/events/CMakeLists.txt
+++ b/events/CMakeLists.txt
@@ -9,10 +9,10 @@ if(MBED_OS_ENABLE_TESTS)
     endif()
 endif()
 
-add_library(mbed-events INTERFACE)
+add_library(mbed-events STATIC EXCLUDE_FROM_ALL)
 
 target_include_directories(mbed-events
-    INTERFACE
+    PUBLIC
         .
         ./include
         ./include/events
@@ -20,7 +20,7 @@ target_include_directories(mbed-events
 )
 
 target_sources(mbed-events
-    INTERFACE
+    PRIVATE
         source/EventQueue.cpp
         source/equeue.c
         source/equeue_mbed.cpp
@@ -29,6 +29,11 @@ target_sources(mbed-events
 )
 
 target_compile_definitions(mbed-events
-    INTERFACE
+    PUBLIC
         MBED_CONF_EVENTS_PRESENT=1
 )
+
+target_link_libraries(mbed-events
+    PUBLIC
+        mbed-core-flags
+)
\ No newline at end of file
diff --git a/platform/randlib/CMakeLists.txt b/platform/randlib/CMakeLists.txt
index 790b71df24..1231abf746 100644
--- a/platform/randlib/CMakeLists.txt
+++ b/platform/randlib/CMakeLists.txt
@@ -1,21 +1,16 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-randlib INTERFACE)
+add_library(mbed-randlib STATIC EXCLUDE_FROM_ALL)
 
 target_include_directories(mbed-randlib
-    INTERFACE
+    PUBLIC
         include
         include/mbed-client-randlib
         include/mbed-client-randlib/platform
 )
 
 target_sources(mbed-randlib
-    INTERFACE
+    PRIVATE
         source/randLIB.c
 )
-
-target_link_libraries(mbed-randlib
-    INTERFACE
-        mbed-nanostack
-)