diff --git a/src/system/kernel/cache/block_allocator.cpp b/src/system/kernel/cache/block_allocator.cpp
index 6be8eeb536..82a472903d 100644
--- a/src/system/kernel/cache/block_allocator.cpp
+++ b/src/system/kernel/cache/block_allocator.cpp
@@ -7,20 +7,12 @@
 #include "block_cache_private.h"
 
 #include <KernelExport.h>
-#include <fs_cache.h>
 
-#include <lock.h>
-#include <util/kernel_cpp.h>
-#include <util/DoublyLinkedList.h>
 #include <util/AutoLock.h>
-#include <util/khash.h>
 #include <vm.h>
 #include <vm_page.h>
 
-#include <unistd.h>
-#include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
 
 static class BlockAddressPool sBlockAddressPool;
diff --git a/src/system/kernel/cache/block_cache.cpp b/src/system/kernel/cache/block_cache.cpp
index 8042b69cc5..f96202c815 100644
--- a/src/system/kernel/cache/block_cache.cpp
+++ b/src/system/kernel/cache/block_cache.cpp
@@ -15,8 +15,6 @@
 #include <util/DoublyLinkedList.h>
 #include <util/AutoLock.h>
 #include <util/khash.h>
-#include <vm.h>
-#include <vm_page.h>
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -24,14 +22,13 @@
 #include <errno.h>
 
 
-// ToDo: this is a naive implementation to test the API:
-//	1) it does not have any useful memory management (just uses malloc/free)
-//	2) block reading/writing is not at all optimized for speed, it will
+// ToDo: this is a naive but growing implementation to test the API:
+//	1) block reading/writing is not at all optimized for speed, it will
 //	   just read and write single blocks.
-//	3) the locking could be improved; getting a block should not need to
+//	2) the locking could be improved; getting a block should not need to
 //	   wait for blocks to be written
-//	4) dirty blocks are only written back if asked for
-//	5) blocks are never removed yet
+//	3) dirty blocks are only written back if asked for
+//	4) blocks are never removed yet
 
 #define TRACE_BLOCK_CACHE
 #ifdef TRACE_BLOCK_CACHE
diff --git a/src/system/kernel/cache/block_cache_private.h b/src/system/kernel/cache/block_cache_private.h
index 50b23e9e25..bea33bc760 100644
--- a/src/system/kernel/cache/block_cache_private.h
+++ b/src/system/kernel/cache/block_cache_private.h
@@ -6,17 +6,11 @@
 #define BLOCK_CACHE_PRIVATE_H
 
 
-#include <KernelExport.h>
-#include <fs_cache.h>
-
-#include <block_cache.h>
 #include <lock.h>
-#include <util/kernel_cpp.h>
 #include <util/DoublyLinkedList.h>
-#include <util/AutoLock.h>
-#include <util/khash.h>
-#include <vm.h>
-#include <vm_page.h>
+
+struct hash_table;
+struct vm_page;
 
 
 #define DEBUG_CHANGED