diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index cd7eda227c..b360a711df 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -7,10 +7,10 @@ add_library(libmicropython STATIC IMPORTED)
 set_target_properties(libmicropython PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/libmicropython.a)
 target_link_libraries(app libmicropython)
 
-zephyr_get_include_directories_as_string(includes)
-zephyr_get_system_include_directories_as_string(system_includes)
-zephyr_get_compile_definitions_as_string(definitions)
-zephyr_get_compile_options_as_string(options)
+zephyr_get_include_directories_for_lang_as_string(C includes)
+zephyr_get_system_include_directories_for_lang_as_string(C system_includes)
+zephyr_get_compile_definitions_for_lang_as_string(C definitions)
+zephyr_get_compile_options_for_lang_as_string(C options)
 
 add_custom_target(
   outputexports
diff --git a/ports/zephyr/Makefile b/ports/zephyr/Makefile
index d6d711d1c2..2064fcef7e 100644
--- a/ports/zephyr/Makefile
+++ b/ports/zephyr/Makefile
@@ -105,4 +105,4 @@ outdir/$(BOARD)/Makefile: $(CONF_FILE)
 
 $(Z_EXPORTS): outdir/$(BOARD)/Makefile
 	make --no-print-directory -C outdir/$(BOARD) outputexports CMAKE_COMMAND=: >$@
-	make -C outdir/$(BOARD) syscall_macros_h_target
+	make -C outdir/$(BOARD) syscall_macros_h_target syscall_list_h_target