diff --git a/ruamoko/include/hash.h b/ruamoko/include/hash.h
index 8c07169aa..2d0aa80fc 100644
--- a/ruamoko/include/hash.h
+++ b/ruamoko/include/hash.h
@@ -1,24 +1,24 @@
 #ifndef __ruamoko_hash_h
 #define __ruamoko_hash_h
 
-typedef struct _hashtab_t *hashtab_t;
+typedef struct _hashtab_t hashtab_t;
 
-@extern hashtab_t Hash_NewTable (int size, string gk (void *ele, void *data), void f (void *ele, void *data), void *ud);
-@extern void Hash_SetHashCompare (hashtab_t tab, unsigned gh (void *ele, void *data), int cmp (void *ele1, void *ele2, void *data));
-@extern void Hash_DelTable (hashtab_t tab);
-@extern void Hash_FlushTable (hashtab_t tab);
-@extern int Hash_Add (hashtab_t tab, void *ele);
-@extern int Hash_AddElement (hashtab_t tab, void *ele);
-@extern void *Hash_Find (hashtab_t tab, string key);
-@extern void *Hash_FindElement (hashtab_t tab, void *ele);
-@extern void **Hash_FindList (hashtab_t tab, string key);
-@extern void **Hash_FindElementList (hashtab_t tab, void *ele);
-@extern void *Hash_Del (hashtab_t tab, string key);
-@extern void *Hash_DelElement (hashtab_t tab, void *ele);
-@extern void Hash_Free (hashtab_t tab, void *ele);
+@extern hashtab_t *Hash_NewTable (int size, string gk (void *ele, void *data), void f (void *ele, void *data), void *ud);
+@extern void Hash_SetHashCompare (hashtab_t *tab, unsigned gh (void *ele, void *data), int cmp (void *ele1, void *ele2, void *data));
+@extern void Hash_DelTable (hashtab_t *tab);
+@extern void Hash_FlushTable (hashtab_t *tab);
+@extern int Hash_Add (hashtab_t *tab, void *ele);
+@extern int Hash_AddElement (hashtab_t *tab, void *ele);
+@extern void *Hash_Find (hashtab_t *tab, string key);
+@extern void *Hash_FindElement (hashtab_t *tab, void *ele);
+@extern void **Hash_FindList (hashtab_t *tab, string key);
+@extern void **Hash_FindElementList (hashtab_t *tab, void *ele);
+@extern void *Hash_Del (hashtab_t *tab, string key);
+@extern void *Hash_DelElement (hashtab_t *tab, void *ele);
+@extern void Hash_Free (hashtab_t *tab, void *ele);
 @extern int Hash_String (string str);
 @extern int Hash_Buffer (void *buf, int len);
-@extern void **Hash_GetList (hashtab_t tab);
-@extern void Hash_Stats (hashtab_t tab);
+@extern void **Hash_GetList (hashtab_t *tab);
+@extern void Hash_Stats (hashtab_t *tab);
 
 #endif	// __ruamoko_hash_h
diff --git a/ruamoko/lib/hash.r b/ruamoko/lib/hash.r
index 24844bfc2..a70d59b10 100644
--- a/ruamoko/lib/hash.r
+++ b/ruamoko/lib/hash.r
@@ -1,19 +1,19 @@
 #include "hash.h"
 
-hashtab_t Hash_NewTable (int size, string gk (void *ele, void *data), void f (void *ele, void *data), void *ud) = #0;
-void Hash_SetHashCompare (hashtab_t tab, unsigned gh (void *ele, void *data), int cmp (void *ele1, void *ele2, void *data)) = #0;
-void Hash_DelTable (hashtab_t tab) = #0;
-void Hash_FlushTable (hashtab_t tab) = #0;
-int Hash_Add (hashtab_t tab, void *ele) = #0;
-int Hash_AddElement (hashtab_t tab, void *ele) = #0;
-void *Hash_Find (hashtab_t tab, string key) = #0;
-void *Hash_FindElement (hashtab_t tab, void *ele) = #0;
-void **Hash_FindList (hashtab_t tab, string key) = #0;
-void **Hash_FindElementList (hashtab_t tab, void *ele) = #0;
-void *Hash_Del (hashtab_t tab, string key) = #0;
-void *Hash_DelElement (hashtab_t tab, void *ele) = #0;
-void Hash_Free (hashtab_t tab, void *ele) = #0;
+hashtab_t *Hash_NewTable (int size, string gk (void *ele, void *data), void f (void *ele, void *data), void *ud) = #0;
+void Hash_SetHashCompare (hashtab_t *tab, unsigned gh (void *ele, void *data), int cmp (void *ele1, void *ele2, void *data)) = #0;
+void Hash_DelTable (hashtab_t *tab) = #0;
+void Hash_FlushTable (hashtab_t *tab) = #0;
+int Hash_Add (hashtab_t *tab, void *ele) = #0;
+int Hash_AddElement (hashtab_t *tab, void *ele) = #0;
+void *Hash_Find (hashtab_t *tab, string key) = #0;
+void *Hash_FindElement (hashtab_t *tab, void *ele) = #0;
+void **Hash_FindList (hashtab_t *tab, string key) = #0;
+void **Hash_FindElementList (hashtab_t *tab, void *ele) = #0;
+void *Hash_Del (hashtab_t *tab, string key) = #0;
+void *Hash_DelElement (hashtab_t *tab, void *ele) = #0;
+void Hash_Free (hashtab_t *tab, void *ele) = #0;
 int Hash_String (string str) = #0;
 int Hash_Buffer (void *buf, int len) = #0;
-void **Hash_GetList (hashtab_t tab) = #0;
-void Hash_Stats (hashtab_t tab) = #0;
+void **Hash_GetList (hashtab_t *tab) = #0;
+void Hash_Stats (hashtab_t *tab) = #0;
diff --git a/ruamoko/scheme/Machine.h b/ruamoko/scheme/Machine.h
index 7c99a2433..a7da59f61 100644
--- a/ruamoko/scheme/Machine.h
+++ b/ruamoko/scheme/Machine.h
@@ -11,7 +11,7 @@
 {
     state_t state;
     SchemeObject *value;
-    hashtab_t globals;
+    hashtab_t *globals;
     SchemeObject *all_globals;
 }
 - (void) loadCode: (CompiledCode *) code;
diff --git a/ruamoko/scheme/Symbol.r b/ruamoko/scheme/Symbol.r
index 0704b3a50..b83f3dbd6 100644
--- a/ruamoko/scheme/Symbol.r
+++ b/ruamoko/scheme/Symbol.r
@@ -16,7 +16,7 @@ void SymbolFree (void *ele, void *data)
     [s release];
 }
     
-hashtab_t symbols;
+hashtab_t *symbols;
 Symbol *lparen;
 Symbol *rparen;
 Symbol *quote;