diff -r c798d6db076b -r 66ec30bde5e5 librazor/razor-internal.h
--- a/librazor/razor-internal.h	Wed Apr 22 16:27:11 2009 +0100
+++ b/librazor/razor-internal.h	Sat May 09 21:30:22 2009 +0100
@@ -26,6 +26,7 @@
 #include <unistd.h>
 
 #include "razor.h"
+#include "types/types.h"
 
 /* GCC visibility */
 #if defined(__GNUC__) && __GNUC__ >= 4
@@ -39,49 +40,6 @@
 
 void *zalloc(size_t size);
 
-struct array {
-	void *data;
-	int size, alloc;
-};
-
-void array_init(struct array *array);
-void array_release(struct array *array);
-void *array_add(struct array *array, int size);
-
-
-struct list_head {
-	uint32_t list_ptr : 24;
-	uint32_t flags    : 8;
-};
-
-struct list {
-	uint32_t data  : 24;
-	uint32_t flags : 8;
-};
-
-void list_set_empty(struct list_head *head);
-void list_set_ptr(struct list_head *head, uint32_t ptr);
-void list_set_array(struct list_head *head, struct array *pool, struct array *items, int force_indirect);
-
-struct list *list_first(struct list_head *head, struct array *pool);
-struct list *list_next(struct list *list);
-
-void list_remap_pool(struct array *pool, uint32_t *map);
-void list_remap_head(struct list_head *list, uint32_t *map);
-
-
-struct hashtable {
-	struct array buckets;
-	struct array *pool;
-};
-
-void hashtable_init(struct hashtable *table, struct array *pool);
-void hashtable_release(struct hashtable *table);
-uint32_t hashtable_insert(struct hashtable *table, const char *key);
-uint32_t hashtable_lookup(struct hashtable *table, const char *key);
-uint32_t hashtable_tokenize(struct hashtable *table, const char *string);
-
-
 struct razor_set_section {
 	uint32_t name;
 	uint32_t offset;