diff --git a/libraries/libgfd/CMakeLists.txt b/libraries/libgfd/CMakeLists.txt
index c255490..d031a82 100644
--- a/libraries/libgfd/CMakeLists.txt
+++ b/libraries/libgfd/CMakeLists.txt
@@ -1,10 +1,9 @@
 cmake_minimum_required(VERSION 3.2)
 project(libgfd)
 
-file(GLOB_RECURSE SOURCE_FILES *.c)
-file(GLOB_RECURSE HEADER_FILES *.h)
-
-add_library(gfd STATIC ${SOURCE_FILES} ${HEADER_FILES})
+add_library(gfd STATIC
+   src/gfd.c
+   include/gfd.h)
 
 target_include_directories(gfd PRIVATE "../../include")
 target_include_directories(gfd PUBLIC "include")
diff --git a/libraries/libwhb/CMakeLists.txt b/libraries/libwhb/CMakeLists.txt
index 36702ed..31d8543 100644
--- a/libraries/libwhb/CMakeLists.txt
+++ b/libraries/libwhb/CMakeLists.txt
@@ -1,10 +1,34 @@
 cmake_minimum_required(VERSION 3.2)
 project(libwhb)
 
-file(GLOB_RECURSE SOURCE_FILES *.c)
-file(GLOB_RECURSE HEADER_FILES *.h)
-
-add_library(whb STATIC ${SOURCE_FILES} ${HEADER_FILES})
+add_library(whb STATIC
+   src/commandserver.c
+   src/console.c
+   src/crash.c
+   src/file.c
+   src/gfx.c
+   src/gfx_heap.c
+   src/gfx_heap.h
+   src/gfx_shader.c
+   src/gfx_texture.c
+   src/libmanager.c
+   src/log.c
+   src/log_cafe.c
+   src/log_udp.c
+   src/proc.c
+   src/sdcard.c
+   include/whb/align.h
+   include/whb/commandserver.h
+   include/whb/crash.h
+   include/whb/file.h
+   include/whb/gfx.h
+   include/whb/libmanager.h
+   include/whb/log_cafe.h
+   include/whb/log_console.h
+   include/whb/log.h
+   include/whb/log_udp.h
+   include/whb/proc.h
+   include/whb/sdcard.h)
 
 target_include_directories(whb PRIVATE "../../include")
 target_include_directories(whb PRIVATE "../libgfd/include")
diff --git a/tools/elf2rpl/CMakeLists.txt b/tools/elf2rpl/CMakeLists.txt
index ed1ac1c..15700b8 100644
--- a/tools/elf2rpl/CMakeLists.txt
+++ b/tools/elf2rpl/CMakeLists.txt
@@ -1,10 +1,7 @@
 project(elf2rpl)
 
-file(GLOB_RECURSE SOURCE_FILES *.cpp)
-file(GLOB_RECURSE HEADER_FILES *.h)
-
 add_executable(elf2rpl
-   ${SOURCE_FILES} ${HEADER_FILES})
+   main.cpp)
 
 target_link_libraries(elf2rpl
    excmd