Index: kernel/genarch/include/genarch/mm/as_ht.h
===================================================================
--- kernel/genarch/include/genarch/mm/as_ht.h	(revision 300916479fd4f230c8e5bb4f9d81b09c3f02feb5)
+++ kernel/genarch/include/genarch/mm/as_ht.h	(revision b3536a08e653e79033c58790a83cb4da9bcd779e)
@@ -37,5 +37,5 @@
 
 #include <mm/mm.h>
-#include <adt/list.h>
+#include <adt/hash_table.h>
 #include <typedefs.h>
 
@@ -46,5 +46,5 @@
 
 typedef struct pte {
-	link_t link;		/**< Page hash table link. */
+	ht_link_t link;		/**< Page hash table link. */
 	struct as *as;		/**< Address space. */
 	uintptr_t page;		/**< Virtual memory page. */
Index: kernel/genarch/include/genarch/mm/page_ht.h
===================================================================
--- kernel/genarch/include/genarch/mm/page_ht.h	(revision 300916479fd4f230c8e5bb4f9d81b09c3f02feb5)
+++ kernel/genarch/include/genarch/mm/page_ht.h	(revision b3536a08e653e79033c58790a83cb4da9bcd779e)
@@ -46,10 +46,6 @@
 #include <adt/hash_table.h>
 
-#define PAGE_HT_KEYS  2
 #define KEY_AS        0
 #define KEY_PAGE      1
-
-#define PAGE_HT_ENTRIES_BITS  13
-#define PAGE_HT_ENTRIES       (1 << PAGE_HT_ENTRIES_BITS)
 
 /* Macros for querying page hash table PTEs. */
@@ -66,5 +62,5 @@
 extern slab_cache_t *pte_cache;
 extern hash_table_t page_ht;
-extern hash_table_operations_t ht_operations;
+extern hash_table_ops_t ht_ops;
 
 #endif