diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4abdfb9..825deb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ set(CMAKE_EXE_LINKER_FLAGS
 
 set(malloc_impl dlmalloc)
 set(photon_libc_sources "")
-set(generic_dirs string stdio internal)
+set(generic_dirs string stdio stdlib errno internal)
 
 message(STATUS "Memory allocator: ${malloc_impl}")
 
@@ -34,8 +34,8 @@ foreach (dir ${generic_dirs})
 endforeach (dir)
 
 file(GLOB malloc_sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/photon/libc/stdlib/${malloc_impl}/*.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/photon/libc/stdlib/${malloc_impl}/*.h)
+    ${CMAKE_CURRENT_SOURCE_DIR}/photon/libc/malloc/${malloc_impl}/*.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/photon/libc/malloc/${malloc_impl}/*.h)
 file(GLOB_RECURSE photon_libc_headers ${CMAKE_CURRENT_SOURCE_DIR}/photon/libc/include/*.h)
 
 file(GLOB photon_libc_crt
@@ -91,7 +91,6 @@ foreach (platform_include_dir ${photon_platform_extra_include_dirs})
         ${CMAKE_CURRENT_SOURCE_DIR}/photon/libc/sys/${platform}/${platform_include_dir})
 endforeach (platform_include_dir)
 
-
 add_custom_target(local-root
     DEPENDS ${photon_libc_headers}
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/create-sysroot.sh