4 files changed, 6 insertions, 5 deletions
diff --git a/shash.h b/shash.h
index 537449e..b7eb396 100644
--- a/shash.h
+++ b/shash.h
@@ -36,7 +36,7 @@ void *shash_get(StrHashTable *h, strv_t key);
 void shash_put(StrHashTable *h, strv_t key, void *value);
 StrHashEntry *shash_find(StrHashTable *h, strv_t key);
 
-#ifdef STDWRM_IMPL_SHASH
+#ifdef SHASH_IMPL
 
 /* hacky FNV-1a hash */
 
diff --git a/stdwrm.h b/stdwrm.h
index 1ee7281..a1f9d0d 100644
--- a/stdwrm.h
+++ b/stdwrm.h
@@ -2,8 +2,9 @@
 #define STDWRM_H
 
 #ifdef STDWRM_IMPL
-#define STDWRM_IMPL_SHASH
-#define STDWRM_IMPL_STR
+#define SHASH_IMPL
+#define ZONE_IMPL
+#define STR_IMPL
 #endif
 
 #endif
diff --git a/str.h b/str.h
index bafec19..deac90d 100644
--- a/str.h
+++ b/str.h
@@ -25,7 +25,7 @@ void sreplace(string *str, size_t i, size_t n, strv_t with);
 string sfmt(const char *fmt, ...);
 string sdup(const char *);
 
-#ifdef STDWRM_IMPL_STR
+#ifdef STR_IMPL
 
 #include <stdarg.h>
 
diff --git a/strio.h b/strio.h
index 6aaf741..ad1dabd 100644
--- a/strio.h
+++ b/strio.h
@@ -11,7 +11,7 @@
 
 string read_whole_file(FILE *f);
 
-#ifdef STDWRM_IMPL_STR
+#ifdef STR_IMPL
 
 #include <stdio.h>