diff --git a/headers/private/kernel/Notifications.h b/headers/private/kernel/Notifications.h
index 728bbfa35b..d3ea2fe466 100644
--- a/headers/private/kernel/Notifications.h
+++ b/headers/private/kernel/Notifications.h
@@ -14,7 +14,7 @@
 
 #include <lock.h>
 #include <messaging.h>
-#include <util/khash.h>
+#include <util/StringHash.h>
 
 
 #ifdef __cplusplus
diff --git a/src/add-ons/kernel/file_systems/packagefs/indices/Index.h b/src/add-ons/kernel/file_systems/packagefs/indices/Index.h
index 7f82ee6f4e..9f7b75874e 100644
--- a/src/add-ons/kernel/file_systems/packagefs/indices/Index.h
+++ b/src/add-ons/kernel/file_systems/packagefs/indices/Index.h
@@ -10,7 +10,6 @@
 
 #include <SupportDefs.h>
 
-#include <util/khash.h>
 #include <util/OpenHashTable.h>
 
 #include "String.h"
diff --git a/src/add-ons/kernel/file_systems/packagefs/nodes/Node.h b/src/add-ons/kernel/file_systems/packagefs/nodes/Node.h
index a1e72718b7..d4f0764557 100644
--- a/src/add-ons/kernel/file_systems/packagefs/nodes/Node.h
+++ b/src/add-ons/kernel/file_systems/packagefs/nodes/Node.h
@@ -13,7 +13,6 @@
 
 #include <lock.h>
 #include <util/DoublyLinkedList.h>
-#include <util/khash.h>
 #include <util/OpenHashTable.h>
 
 #include "String.h"
diff --git a/src/add-ons/kernel/file_systems/packagefs/package/Package.h b/src/add-ons/kernel/file_systems/packagefs/package/Package.h
index e9def7503e..b886188668 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/Package.h
+++ b/src/add-ons/kernel/file_systems/packagefs/package/Package.h
@@ -12,8 +12,8 @@
 #include <Referenceable.h>
 
 #include <util/DoublyLinkedList.h>
-#include <util/khash.h>
 #include <util/OpenHashTable.h>
+#include <util/StringHash.h>
 
 #include <lock.h>
 
diff --git a/src/add-ons/kernel/file_systems/packagefs/resolvables/DependencyFamily.h b/src/add-ons/kernel/file_systems/packagefs/resolvables/DependencyFamily.h
index 25cd4595da..3aeb5a7f5c 100644
--- a/src/add-ons/kernel/file_systems/packagefs/resolvables/DependencyFamily.h
+++ b/src/add-ons/kernel/file_systems/packagefs/resolvables/DependencyFamily.h
@@ -6,7 +6,6 @@
 #define DEPENDENCY_FAMILY_H
 
 
-#include <util/khash.h>
 #include <util/OpenHashTable.h>
 
 #include "Dependency.h"
diff --git a/src/add-ons/kernel/file_systems/packagefs/resolvables/ResolvableFamily.h b/src/add-ons/kernel/file_systems/packagefs/resolvables/ResolvableFamily.h
index d5d8d643c0..3fb41d136d 100644
--- a/src/add-ons/kernel/file_systems/packagefs/resolvables/ResolvableFamily.h
+++ b/src/add-ons/kernel/file_systems/packagefs/resolvables/ResolvableFamily.h
@@ -6,7 +6,6 @@
 #define RESOLVABLE_FAMILY_H
 
 
-#include <util/khash.h>
 #include <util/OpenHashTable.h>
 
 #include "Resolvable.h"
diff --git a/src/add-ons/kernel/file_systems/packagefs/util/StringPool.h b/src/add-ons/kernel/file_systems/packagefs/util/StringPool.h
index 2a97b2aace..f0b5aec4d1 100644
--- a/src/add-ons/kernel/file_systems/packagefs/util/StringPool.h
+++ b/src/add-ons/kernel/file_systems/packagefs/util/StringPool.h
@@ -14,8 +14,8 @@
 #include <new>
 
 #include <util/AutoLock.h>
-#include <util/khash.h>
 #include <util/OpenHashTable.h>
+#include <util/StringHash.h>
 
 
 class StringData;
diff --git a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
index 8c3fae30ab..b0da601fe6 100644
--- a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
+++ b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
@@ -31,7 +31,6 @@
 #include <lock.h>
 #include <tracing.h>
 #include <util/AutoLock.h>
-#include <util/khash.h>
 #include <util/list.h>
 
 #include "EndpointManager.h"
diff --git a/src/add-ons/kernel/network/protocols/tcp/tcp.h b/src/add-ons/kernel/network/protocols/tcp/tcp.h
index 583d32b9b2..64e13acca0 100644
--- a/src/add-ons/kernel/network/protocols/tcp/tcp.h
+++ b/src/add-ons/kernel/network/protocols/tcp/tcp.h
@@ -16,8 +16,6 @@
 #include <net_socket.h>
 #include <net_stack.h>
 
-#include <util/khash.h>
-
 #include <ByteOrder.h>
 
 #include <sys/socket.h>
diff --git a/src/add-ons/kernel/network/protocols/unix/UnixAddress.cpp b/src/add-ons/kernel/network/protocols/unix/UnixAddress.cpp
index 9a3154aca5..12fcb3a81e 100644
--- a/src/add-ons/kernel/network/protocols/unix/UnixAddress.cpp
+++ b/src/add-ons/kernel/network/protocols/unix/UnixAddress.cpp
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <util/khash.h>
+#include <util/StringHash.h>
 
 #include <net_datalink.h>
 #include <NetUtilities.h>
diff --git a/src/system/kernel/fs/EntryCache.h b/src/system/kernel/fs/EntryCache.h
index e197426eec..79a8df0f06 100644
--- a/src/system/kernel/fs/EntryCache.h
+++ b/src/system/kernel/fs/EntryCache.h
@@ -9,8 +9,8 @@
 #include <stdlib.h>
 
 #include <util/AutoLock.h>
-#include <util/khash.h>
 #include <util/OpenHashTable.h>
+#include <util/StringHash.h>
 
 
 struct EntryCacheKey {
diff --git a/src/system/kernel/fs/fifo.cpp b/src/system/kernel/fs/fifo.cpp
index 15d45ffe04..e7e9f2c2e1 100644
--- a/src/system/kernel/fs/fifo.cpp
+++ b/src/system/kernel/fs/fifo.cpp
@@ -22,7 +22,6 @@
 
 #include <condition_variable.h>
 #include <debug_hex_dump.h>
-#include <khash.h>
 #include <lock.h>
 #include <select_sync_pool.h>
 #include <syscall_restart.h>
@@ -44,9 +43,6 @@
 #endif
 
 
-#define PIPEFS_HASH_SIZE		16
-
-
 namespace fifo {
 
 
diff --git a/src/system/kernel/fs/node_monitor.cpp b/src/system/kernel/fs/node_monitor.cpp
index ae5e66e05b..95f16411b8 100644
--- a/src/system/kernel/fs/node_monitor.cpp
+++ b/src/system/kernel/fs/node_monitor.cpp
@@ -16,7 +16,6 @@
 #include <NodeMonitor.h>
 
 #include <fd.h>
-#include <khash.h>
 #include <lock.h>
 #include <messaging.h>
 #include <Notifications.h>