diff --git a/blaze822.c b/blaze822.c
index 7bba970..cd402f1 100644
--- a/blaze822.c
+++ b/blaze822.c
@@ -16,12 +16,6 @@
 #include "blaze822.h"
 #include "blaze822_priv.h"
 
-//          WSP            =  SP / HTAB
-#define iswsp(c)  (((c) == ' ' || (c) == '\t'))
-
-// ASCII lowercase without alpha check (wrong for "@[\]^_")
-#define lc(c) ((c) | 0x20)
-
 #define bufsiz 4096
 
 static long
diff --git a/blaze822_priv.h b/blaze822_priv.h
index dfd8895..5276ff7 100644
--- a/blaze822_priv.h
+++ b/blaze822_priv.h
@@ -6,4 +6,8 @@ struct message {
 	char *bodychunk;
 };
 
+//          WSP            =  SP / HTAB
 #define iswsp(c)  (((c) == ' ' || (c) == '\t'))
+
+// ASCII lowercase without alpha check (wrong for "@[\]^_")
+#define lc(c) ((c) | 0x20)
diff --git a/rfc2047.c b/rfc2047.c
index 15c9cf7..9559608 100644
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -5,10 +5,8 @@
 #include <string.h>
 #include <stdint.h>
 
-#define iswsp(c)  (((c) == ' ' || (c) == '\t'))
-
-// ASCII lowercase without alpha check (wrong for "@[\]^_")
-#define lc(c) ((c) | 0x20)
+#include "blaze822.h"
+#include "blaze822_priv.h"
 
 // XXX error detection on decode
 // XXX keep trying bytewise on invalid iconv