diff --git a/src/linker/hash_table.c b/src/linker/hash_table.c
index 4566eb67..219ac87c 100644
--- a/src/linker/hash_table.c
+++ b/src/linker/hash_table.c
@@ -199,6 +199,20 @@ hash_table_search_path(HashTable *ht, String8 path)
   return result;
 }
 
+internal void *
+hash_table_search_path_raw(HashTable *ht, String8 path)
+{
+  KeyValuePair *kv = hash_table_search_path(ht, path);
+  return kv ? kv->value_raw : 0;
+}
+
+internal void *
+hash_table_(HashTable *ht, String8 path)
+{
+  KeyValuePair *result = hash_table_search_path(ht, path);
+  return result ? result->value_raw : 0;
+}
+
 internal B32
 hash_table_search_path_u64(HashTable *ht, String8 key, U64 *value_out)
 {
diff --git a/src/linker/hash_table.h b/src/linker/hash_table.h
index 51e55a0e..20163a17 100644
--- a/src/linker/hash_table.h
+++ b/src/linker/hash_table.h
@@ -7,6 +7,7 @@ typedef struct KeyValuePair
 {
   union {
     String8 key_string;
+    void   *key_raw;
     U32     key_u32;
     U64     key_u64;
   };
@@ -67,19 +68,21 @@ internal BucketNode * hash_table_push_u64_u64      (Arena *arena, HashTable *ht,
 //- search
 
 internal KeyValuePair * hash_table_search_string  (HashTable *ht, String8 string);
-internal KeyValuePair * hash_table_search_u32     (HashTable *ht, U32 key);
-internal KeyValuePair * hash_table_search_u64     (HashTable *ht, U64 key);
-internal KeyValuePair * hash_table_search_path    (HashTable *ht, String8 path);
+internal KeyValuePair * hash_table_search_u32     (HashTable *ht, U32 key       );
+internal KeyValuePair * hash_table_search_u64     (HashTable *ht, U64 key       );
+internal KeyValuePair * hash_table_search_path    (HashTable *ht, String8 path  );
+internal void *         hash_table_search_path_raw(HashTable *ht, String8 path  );
 
 internal B32 hash_table_search_path_u64(HashTable *ht, String8 key, U64 *value_out);
 
 //- key-value helpers
 
-internal U32 *          keys_from_hash_table_u32(Arena *arena, HashTable *ht);
-internal U64 *          keys_from_hash_table_u64(Arena *arena, HashTable *ht);
+internal U32 *          keys_from_hash_table_u32       (Arena *arena, HashTable *ht);
+internal U64 *          keys_from_hash_table_u64       (Arena *arena, HashTable *ht);
 internal KeyValuePair * key_value_pairs_from_hash_table(Arena *arena, HashTable *ht);
-internal void           sort_key_value_pairs_as_u32(KeyValuePair *pairs, U64 count);
-internal void           sort_key_value_pairs_as_u64(KeyValuePair *pairs, U64 count);
+
+internal void sort_key_value_pairs_as_u32(KeyValuePair *pairs, U64 count);
+internal void sort_key_value_pairs_as_u64(KeyValuePair *pairs, U64 count);
 
 ////////////////////////////////