diff --git a/drivers/sensors/CMakeLists.txt b/drivers/sensors/CMakeLists.txt
index d0d259fbc6..ded9340516 100644
--- a/drivers/sensors/CMakeLists.txt
+++ b/drivers/sensors/CMakeLists.txt
@@ -48,6 +48,10 @@ if(CONFIG_SENSORS)
     list(APPEND SRCS goldfish_gps_uorb.c)
   endif()
 
+  if(CONFIG_SENSORS_GOLDFISH_SENSOR)
+    list(APPEND SRCS goldfish_sensor_uorb.c)
+  endif()
+
   if(CONFIG_SENSORS_HCSR04)
     list(APPEND SRCS hc_sr04.c)
   endif()
@@ -90,6 +94,10 @@ if(CONFIG_SENSORS)
       list(APPEND SRCS apds9960.c)
     endif()
 
+    if(CONFIG_SENSORS_APDS9922)
+      list(APPEND SRCS apds9922.c)
+    endif()
+
     if(CONFIG_SENSORS_AK09912)
       list(APPEND SRCS ak09912.c)
     endif()
@@ -151,6 +159,10 @@ if(CONFIG_SENSORS)
       list(APPEND SRCS adxl345_i2c.c)
     endif()
 
+    if(CONFIG_SENSORS_BH1749NUC)
+      list(APPEND SRCS bh1749nuc.c)
+    endif()
+
     if(CONFIG_SENSORS_BH1750FVI)
       list(APPEND SRCS bh1750fvi.c)
     endif()
@@ -169,7 +181,13 @@ if(CONFIG_SENSORS)
     endif()
 
     if(CONFIG_SENSORS_BMP180)
-      list(APPEND SRCS bmp180.c)
+      list(APPEND SRCS bmp180_base.c)
+      if(CONFIG_SENSORS_BMP180_UORB)
+        list(APPEND SRCS bmp180_uorb.c)
+      else()
+        list(APPEND SRCS bmp180.c)
+      endif()
+
     endif()
 
     if(CONFIG_SENSORS_BMP280)
diff --git a/libs/libc/regex/CMakeLists.txt b/libs/libc/regex/CMakeLists.txt
new file mode 100644
index 0000000000..e023c9012f
--- /dev/null
+++ b/libs/libc/regex/CMakeLists.txt
@@ -0,0 +1,24 @@
+# ##############################################################################
+# libs/libc/regex/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_LIBC_REGEX)
+  set(SRCS regcomp.c regexec.c regerror.c tre-mem.c)
+  target_sources(c PRIVATE ${SRCS})
+endif()