diff --git a/cmake/configs/nuttx_auav-x21_default.cmake b/cmake/configs/nuttx_auav-x21_default.cmake
index e0e63e2ccb..004a368547 100644
--- a/cmake/configs/nuttx_auav-x21_default.cmake
+++ b/cmake/configs/nuttx_auav-x21_default.cmake
@@ -26,8 +26,6 @@ set(config_module_list
 	drivers/gps
 	drivers/pwm_out_sim
 	drivers/hott
-	drivers/hott/hott_telemetry
-	drivers/hott/hott_sensors
 	drivers/blinkm
 	drivers/airspeed
 	drivers/frsky_telemetry
diff --git a/cmake/configs/nuttx_mindpx-v2_default.cmake b/cmake/configs/nuttx_mindpx-v2_default.cmake
index a830353e02..e7cc117a7a 100644
--- a/cmake/configs/nuttx_mindpx-v2_default.cmake
+++ b/cmake/configs/nuttx_mindpx-v2_default.cmake
@@ -20,8 +20,6 @@ set(config_module_list
 	drivers/frsky_telemetry
 	drivers/gps
 	#drivers/hott
-	#drivers/hott/hott_sensors
-	#drivers/hott/hott_telemetry
 	drivers/l3gd20
 	drivers/led
 	drivers/lsm303d
diff --git a/cmake/configs/nuttx_nxphlite-v3_default.cmake b/cmake/configs/nuttx_nxphlite-v3_default.cmake
index ac6d8af2dc..24923782bd 100644
--- a/cmake/configs/nuttx_nxphlite-v3_default.cmake
+++ b/cmake/configs/nuttx_nxphlite-v3_default.cmake
@@ -25,8 +25,6 @@ set(config_module_list
 	drivers/fxas21002c
 	drivers/gps
 	drivers/hott
-	drivers/hott/hott_sensors
-	drivers/hott/hott_telemetry
 	drivers/iridiumsbd
 	drivers/kinetis
 	drivers/kinetis/adc
diff --git a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake
index ff7e51e541..fb2e5f47c3 100644
--- a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake
+++ b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake
@@ -27,8 +27,6 @@ set(config_module_list
 	drivers/gps
 #WIP 	drivers/pwm_out_sim
 	drivers/hott
-	drivers/hott/hott_telemetry
-	drivers/hott/hott_sensors
 	drivers/blinkm
 	drivers/airspeed
 	drivers/frsky_telemetry
diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake
index 73b3065963..1da670cd32 100644
--- a/cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -24,8 +24,6 @@ set(config_module_list
 	#drivers/frsky_telemetry
 	drivers/gps
 	#drivers/hott
-	#drivers/hott/hott_sensors
-	#drivers/hott/hott_telemetry
 	#drivers/iridiumsbd
 	#drivers/irlock
 	drivers/l3gd20
diff --git a/cmake/configs/nuttx_px4fmu-v2_test.cmake b/cmake/configs/nuttx_px4fmu-v2_test.cmake
index 06c430bf04..9308f27a21 100644
--- a/cmake/configs/nuttx_px4fmu-v2_test.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake
@@ -27,8 +27,6 @@ set(config_module_list
 	drivers/gps
 	#drivers/pwm_out_sim
 	#drivers/hott
-	#drivers/hott/hott_telemetry
-	#drivers/hott/hott_sensors
 	drivers/blinkm
 	drivers/airspeed
 	drivers/barometer
diff --git a/cmake/configs/nuttx_px4fmu-v3_default.cmake b/cmake/configs/nuttx_px4fmu-v3_default.cmake
index 59030726e6..24528b31b7 100644
--- a/cmake/configs/nuttx_px4fmu-v3_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v3_default.cmake
@@ -29,8 +29,6 @@ set(config_module_list
 	drivers/frsky_telemetry
 	drivers/gps
 	drivers/hott
-	drivers/hott/hott_sensors
-	drivers/hott/hott_telemetry
 	drivers/iridiumsbd
 	drivers/irlock
 	drivers/l3gd20
diff --git a/cmake/configs/nuttx_px4fmu-v4_default.cmake b/cmake/configs/nuttx_px4fmu-v4_default.cmake
index d7f8adbcee..cb21ed34e0 100644
--- a/cmake/configs/nuttx_px4fmu-v4_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake
@@ -24,8 +24,6 @@ set(config_module_list
 	drivers/frsky_telemetry
 	drivers/gps
 	drivers/hott
-	drivers/hott/hott_sensors
-	drivers/hott/hott_telemetry
 	drivers/iridiumsbd
 	drivers/irlock
 	drivers/led
diff --git a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
index b70a7c6727..2356f2030f 100644
--- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
@@ -23,8 +23,6 @@ set(config_module_list
 	drivers/frsky_telemetry
 	drivers/gps
 	drivers/hott
-	drivers/hott/hott_sensors
-	drivers/hott/hott_telemetry
 	drivers/iridiumsbd
 	drivers/irlock
 	drivers/l3gd20
diff --git a/cmake/configs/nuttx_px4fmu-v5_default.cmake b/cmake/configs/nuttx_px4fmu-v5_default.cmake
index b3acc9ab92..14d7b57728 100644
--- a/cmake/configs/nuttx_px4fmu-v5_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v5_default.cmake
@@ -23,8 +23,6 @@ set(config_module_list
 	drivers/frsky_telemetry
 	drivers/gps
 	drivers/hott
-	drivers/hott/hott_sensors
-	drivers/hott/hott_telemetry
 	drivers/iridiumsbd
 	drivers/irlock
 	drivers/led
diff --git a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
index 811896c69b..2baf46879f 100644
--- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
+++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
@@ -24,8 +24,6 @@ set(config_module_list
 	drivers/frsky_telemetry
 	drivers/gps
 	drivers/hott
-	drivers/hott/hott_sensors
-	drivers/hott/hott_telemetry
 	drivers/led
 	drivers/mkblctrl
 	drivers/mpu6000
diff --git a/src/drivers/hott/CMakeLists.txt b/src/drivers/hott/CMakeLists.txt
index 436c31c84d..e6342b40b7 100644
--- a/src/drivers/hott/CMakeLists.txt
+++ b/src/drivers/hott/CMakeLists.txt
@@ -40,4 +40,6 @@ px4_add_module(
 	DEPENDS
 		platforms__common
 	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
+
+add_subdirectory(hott_sensors)
+add_subdirectory(hott_telemetry)