diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ca1287d16..cbec24e59f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,6 +111,7 @@ set(package-contact "px4users@googlegroups.com")
 
 # set module path
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/${OS})
 
 # prefer board implementation module over os implmementation module
 set(board_impl_module px4_impl_${OS}_${BOARD})
diff --git a/cmake/builtin_commands.c.in b/cmake/nuttx/builtin_commands.c.in
similarity index 100%
rename from cmake/builtin_commands.c.in
rename to cmake/nuttx/builtin_commands.c.in
diff --git a/cmake/px4_impl_nuttx.cmake b/cmake/nuttx/px4_impl_nuttx.cmake
similarity index 99%
rename from cmake/px4_impl_nuttx.cmake
rename to cmake/nuttx/px4_impl_nuttx.cmake
index 8f36855bd9..4e4724b184 100644
--- a/cmake/px4_impl_nuttx.cmake
+++ b/cmake/nuttx/px4_impl_nuttx.cmake
@@ -143,7 +143,7 @@ function(px4_nuttx_generate_builtin_commands)
 			math(EXPR command_count "${command_count}+1")
 		endif()
 	endforeach()
-	configure_file(${CMAKE_SOURCE_DIR}/cmake/builtin_commands.c.in
+	configure_file(${CMAKE_SOURCE_DIR}/cmake/nuttx/builtin_commands.c.in
 		${OUT})
 endfunction()
 
diff --git a/cmake/px4_impl_qurt.cmake b/cmake/qurt/px4_impl_qurt.cmake
similarity index 100%
rename from cmake/px4_impl_qurt.cmake
rename to cmake/qurt/px4_impl_qurt.cmake
diff --git a/src/modules/systemlib/perf_counter.c b/src/modules/systemlib/perf_counter.c
index 105b958898..a9d9db9748 100644
--- a/src/modules/systemlib/perf_counter.c
+++ b/src/modules/systemlib/perf_counter.c
@@ -49,7 +49,7 @@
 #define dprintf(...)
 #define ddeclare(...)
 #else
-#define ddeclare(...) __VA_ARGS_
+#define ddeclare(...) __VA_ARGS__
 #endif
 
 /**