diff --git a/connectivity/libraries/CMakeLists.txt b/connectivity/libraries/CMakeLists.txt
index 3cbc2453b7..18ce713470 100644
--- a/connectivity/libraries/CMakeLists.txt
+++ b/connectivity/libraries/CMakeLists.txt
@@ -3,3 +3,4 @@
 
 add_subdirectory(mbed-coap)
 add_subdirectory(nanostack-libservice)
+add_subdirectory(ppp)
diff --git a/features/netsocket/ppp/CMakeLists.txt b/connectivity/libraries/ppp/CMakeLists.txt
similarity index 75%
rename from features/netsocket/ppp/CMakeLists.txt
rename to connectivity/libraries/ppp/CMakeLists.txt
index 75c233b5f6..bfacd3ee62 100644
--- a/features/netsocket/ppp/CMakeLists.txt
+++ b/connectivity/libraries/ppp/CMakeLists.txt
@@ -1,18 +1,16 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+target_include_directories(mbed-os
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/polarssl
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ppp
+)
+
 target_sources(mbed-os
     PRIVATE
-        ppp_nsapi.cpp
-        ppp_service.cpp
-        ppp_service_if.cpp
-
-        polarssl/ppp_arc4.c
-        polarssl/ppp_des.c
-        polarssl/ppp_md4.c
-        polarssl/ppp_md5.c
-        polarssl/ppp_sha1.c
-
         source/auth.c
         source/ccp.c
         source/chap-md5.c
@@ -30,6 +28,8 @@ target_sources(mbed-os
         source/multilink.c
         source/ppp.c
         source/ppp_ecp.c
+        source/ppp_service.cpp
+        source/ppp_service_if.cpp
         source/pppapi.c
         source/pppcrypt.c
         source/pppoe.c
@@ -38,12 +38,10 @@ target_sources(mbed-os
         source/upap.c
         source/utils.c
         source/vj.c
-)
 
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/polarssl
+        source/polarssl/ppp_arc4.c
+        source/polarssl/ppp_des.c
+        source/polarssl/ppp_md4.c
+        source/polarssl/ppp_md5.c
+        source/polarssl/ppp_sha1.c
 )
diff --git a/features/netsocket/CMakeLists.txt b/features/netsocket/CMakeLists.txt
index 6bcda11b99..eccb3305fe 100644
--- a/features/netsocket/CMakeLists.txt
+++ b/features/netsocket/CMakeLists.txt
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(emac-drivers)
-add_subdirectory(ppp)
 
 target_include_directories(mbed-os
     PUBLIC
diff --git a/rtos/CMakeLists.txt b/rtos/CMakeLists.txt
index dee5f05a40..78dd9dde68 100644
--- a/rtos/CMakeLists.txt
+++ b/rtos/CMakeLists.txt
@@ -18,5 +18,8 @@ add_subdirectory(source/TARGET_CORTEX)
 target_include_directories(mbed-os
     PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
-        source
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/rtos
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/rtos/internal
+        ${CMAKE_CURRENT_SOURCE_DIR}/source
 )