diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index ee1ae90ce61..689b8bc08e5 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -36,7 +36,7 @@ if(WITH_CYCLES_OSL)
 endif()
 
 if(NOT CYCLES_STANDALONE_REPOSITORY)
-	list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc)
+	list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc bf_intern_numaapi)
 endif()
 
 if(WITH_CYCLES_LOGGING)
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index 42626d05cf9..16abed142b2 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -33,6 +33,9 @@ if(WITH_CYCLES_STANDALONE)
 			util_view.cpp
 		)
 	endif()
+endif()
+
+if(CYCLES_STANDALONE_REPOSITORY)
 	list(APPEND INC_SYS ../../third_party/numaapi/include)
 else()
 	list(APPEND INC_SYS ../../numaapi/include)