diff --git a/kernel/thread.c b/kernel/thread.c
index 7e48ecc0..d50e019b 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -37,7 +37,6 @@
 #include <string.h>
 #include <printf.h>
 #include <lk/err.h>
-#include <lib/dpc.h>
 #include <kernel/thread.h>
 #include <kernel/timer.h>
 #include <kernel/debug.h>
diff --git a/lib/bio/debug.c b/lib/bio/debug.c
index c06df7f1..e2dfb281 100644
--- a/lib/bio/debug.c
+++ b/lib/bio/debug.c
@@ -28,13 +28,15 @@
 #include <lk/err.h>
 #include <lib/console.h>
 #include <lib/bio.h>
-#include <lib/partition.h>
 #include <platform.h>
 #include <kernel/thread.h>
 
 #if WITH_LIB_CKSUM
 #include <lib/cksum.h>
 #endif
+#if WITH_LIB_PARTITION
+#include <lib/partition.h>
+#endif
 
 #define DMA_ALIGNMENT (CACHE_LINE)
 #define THREE_BYTE_ADDR_BOUNDARY (16777216)
diff --git a/include/lib/bytes.h b/lib/bytes/include/lib/bytes.h
similarity index 100%
rename from include/lib/bytes.h
rename to lib/bytes/include/lib/bytes.h
diff --git a/include/lib/dpc.h b/lib/dpc/include/lib/dpc.h
similarity index 100%
rename from include/lib/dpc.h
rename to lib/dpc/include/lib/dpc.h
diff --git a/include/lib/evlog.h b/lib/evlog/include/lib/evlog.h
similarity index 100%
rename from include/lib/evlog.h
rename to lib/evlog/include/lib/evlog.h
diff --git a/include/lib/font.h b/lib/font/include/lib/font.h
similarity index 100%
rename from include/lib/font.h
rename to lib/font/include/lib/font.h
diff --git a/include/lib/gfx.h b/lib/gfx/include/lib/gfx.h
similarity index 100%
rename from include/lib/gfx.h
rename to lib/gfx/include/lib/gfx.h
diff --git a/include/lib/gfxconsole.h b/lib/gfxconsole/include/lib/gfxconsole.h
similarity index 100%
rename from include/lib/gfxconsole.h
rename to lib/gfxconsole/include/lib/gfxconsole.h
diff --git a/include/lib/page_alloc.h b/lib/heap/include/lib/page_alloc.h
similarity index 100%
rename from include/lib/page_alloc.h
rename to lib/heap/include/lib/page_alloc.h
diff --git a/include/lib/partition.h b/lib/partition/include/lib/partition.h
similarity index 100%
rename from include/lib/partition.h
rename to lib/partition/include/lib/partition.h
diff --git a/include/lib/ptable.h b/lib/ptable/include/lib/ptable.h
similarity index 100%
rename from include/lib/ptable.h
rename to lib/ptable/include/lib/ptable.h
diff --git a/include/lib/sysparam.h b/lib/sysparam/include/lib/sysparam.h
similarity index 100%
rename from include/lib/sysparam.h
rename to lib/sysparam/include/lib/sysparam.h
diff --git a/include/lib/text.h b/lib/text/include/lib/text.h
similarity index 100%
rename from include/lib/text.h
rename to lib/text/include/lib/text.h
diff --git a/platform/stm32f7xx/eth.c b/platform/stm32f7xx/eth.c
index a37abc5c..eadf21b4 100644
--- a/platform/stm32f7xx/eth.c
+++ b/platform/stm32f7xx/eth.c
@@ -56,9 +56,7 @@
 #include <lk/compiler.h>
 #include <stdlib.h>
 #include <string.h>
-#include <lib/gfx.h>
 #include <dev/gpio.h>
-#include <dev/display.h>
 #include <kernel/event.h>
 #include <kernel/thread.h>
 #include <arch/ops.h>