diff --git a/ports/comms-ublox/portfile.cmake b/ports/comms-ublox/portfile.cmake
index e308ccd7b2..b53efd439a 100644
--- a/ports/comms-ublox/portfile.cmake
+++ b/ports/comms-ublox/portfile.cmake
@@ -18,10 +18,10 @@ vcpkg_configure_cmake(
         -DOPT_BUILD_PLUGIN=OFF
         -DOPT_NO_COMMS=ON
         -DOPT_EXTERNALS_UPDATE_DISCONNECTED=ON
+        -DCMAKE_INSTALL_INCLUDEDIR="${CURRENT_PACKAGES_DIR}/include"
 )
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
diff --git a/ports/comms/portfile.cmake b/ports/comms/portfile.cmake
index 6a93de71f4..7024410d73 100644
--- a/ports/comms/portfile.cmake
+++ b/ports/comms/portfile.cmake
@@ -14,10 +14,10 @@ vcpkg_configure_cmake(
     OPTIONS
         -DCC_COMMS_LIB_ONLY=ON
         -DCC_NO_UNIT_TESTS=ON
+        -DCMAKE_INSTALL_INCLUDEDIR="${CURRENT_PACKAGES_DIR}/include"
 )
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake
index c785fd80aa..dd3b7e8330 100644
--- a/ports/commsdsl/portfile.cmake
+++ b/ports/commsdsl/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_configure_cmake(
         -DCOMMSDSL_NO_COMMS_CHAMPION=ON
         -DCOMMSDSL_NO_TESTS=ON
         -DCOMMSDSL_NO_WARN_AS_ERR=ON # remove on next version or on next version of boost
+        -DCMAKE_INSTALL_INCLUDEDIR="${CURRENT_PACKAGES_DIR}/include"
 )
 vcpkg_install_cmake()
 
@@ -24,8 +25,6 @@ vcpkg_copy_tools(
     AUTO_CLEAN
 )
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()