diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
index df3bb83..9324599 100644
--- a/util/CMakeLists.txt
+++ b/util/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_library(util INTERFACE)
 target_include_directories(util INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(util INTERFACE pico_stdlib)
diff --git a/include/callback_list.h b/util/callback_list.h
similarity index 100%
rename from include/callback_list.h
rename to util/callback_list.h
diff --git a/include/parse_buffer.h b/util/parse_buffer.h
similarity index 100%
rename from include/parse_buffer.h
rename to util/parse_buffer.h
diff --git a/include/prepend_buffer.h b/util/prepend_buffer.h
similarity index 100%
rename from include/prepend_buffer.h
rename to util/prepend_buffer.h
diff --git a/include/static_vector.h b/util/static_vector.h
similarity index 100%
rename from include/static_vector.h
rename to util/static_vector.h
diff --git a/include/timer_queue.h b/util/timer_queue.h
similarity index 100%
rename from include/timer_queue.h
rename to util/timer_queue.h