diff --git a/Makefile b/Makefile
index 1ce2411..9d1c03d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,8 @@ activitypub.o: activitypub.c xs.h xs_json.h xs_curl.h xs_mime.h \
  xs_openssl.h xs_regex.h xs_time.h xs_set.h xs_match.h snac.h \
  http_codes.h
 data.o: data.c xs.h xs_hex.h xs_io.h xs_json.h xs_openssl.h xs_glob.h \
- xs_set.h xs_time.h xs_regex.h xs_match.h snac.h http_codes.h
+ xs_set.h xs_time.h xs_regex.h xs_match.h xs_unicode.h snac.h \
+ http_codes.h
 format.o: format.c xs.h xs_regex.h xs_mime.h xs_html.h xs_json.h \
  xs_time.h snac.h http_codes.h
 html.o: html.c xs.h xs_io.h xs_json.h xs_regex.h xs_set.h xs_openssl.h \
@@ -52,10 +53,10 @@ main.o: main.c xs.h xs_io.h xs_json.h xs_time.h xs_openssl.h snac.h \
 mastoapi.o: mastoapi.c xs.h xs_hex.h xs_openssl.h xs_json.h xs_io.h \
  xs_time.h xs_glob.h xs_set.h xs_random.h xs_url.h xs_mime.h xs_match.h \
  snac.h http_codes.h
-snac.o: snac.c xs.h xs_hex.h xs_io.h xs_unicode.h xs_json.h xs_curl.h \
- xs_openssl.h xs_socket.h xs_unix_socket.h xs_url.h xs_httpd.h xs_mime.h \
- xs_regex.h xs_set.h xs_time.h xs_glob.h xs_random.h xs_match.h xs_fcgi.h \
- xs_html.h snac.h http_codes.h
+snac.o: snac.c xs.h xs_hex.h xs_io.h xs_unicode_tbl.h xs_unicode.h \
+ xs_json.h xs_curl.h xs_openssl.h xs_socket.h xs_unix_socket.h xs_url.h \
+ xs_httpd.h xs_mime.h xs_regex.h xs_set.h xs_time.h xs_glob.h xs_random.h \
+ xs_match.h xs_fcgi.h xs_html.h snac.h http_codes.h
 upgrade.o: upgrade.c xs.h xs_io.h xs_json.h xs_glob.h snac.h http_codes.h
 utils.o: utils.c xs.h xs_io.h xs_json.h xs_time.h xs_openssl.h \
  xs_random.h xs_glob.h xs_curl.h xs_regex.h snac.h http_codes.h
diff --git a/Makefile.NetBSD b/Makefile.NetBSD
index bb2f1bc..8883949 100644
--- a/Makefile.NetBSD
+++ b/Makefile.NetBSD
@@ -36,26 +36,31 @@ uninstall:
 	rm $(PREFIX_MAN)/man8/snac.8
 
 activitypub.o: activitypub.c xs.h xs_json.h xs_curl.h xs_mime.h \
- xs_openssl.h xs_regex.h xs_time.h xs_set.h xs_match.h snac.h
+ xs_openssl.h xs_regex.h xs_time.h xs_set.h xs_match.h snac.h \
+ http_codes.h
 data.o: data.c xs.h xs_hex.h xs_io.h xs_json.h xs_openssl.h xs_glob.h \
- xs_set.h xs_time.h xs_regex.h xs_match.h snac.h
+ xs_set.h xs_time.h xs_regex.h xs_match.h xs_unicode.h snac.h \
+ http_codes.h
 format.o: format.c xs.h xs_regex.h xs_mime.h xs_html.h xs_json.h \
- xs_time.h snac.h
+ xs_time.h snac.h http_codes.h
 html.o: html.c xs.h xs_io.h xs_json.h xs_regex.h xs_set.h xs_openssl.h \
- xs_time.h xs_mime.h xs_match.h xs_html.h snac.h
+ xs_time.h xs_mime.h xs_match.h xs_html.h snac.h http_codes.h
 http.o: http.c xs.h xs_io.h xs_openssl.h xs_curl.h xs_time.h xs_json.h \
- snac.h
-httpd.o: httpd.c xs.h xs_io.h xs_json.h xs_socket.h xs_httpd.h xs_mime.h \
- xs_time.h xs_openssl.h xs_fcgi.h xs_html.h snac.h
-main.o: main.c xs.h xs_io.h xs_json.h xs_time.h xs_openssl.h snac.h
+ snac.h http_codes.h
+httpd.o: httpd.c xs.h xs_io.h xs_json.h xs_socket.h xs_unix_socket.h \
+ xs_httpd.h xs_mime.h xs_time.h xs_openssl.h xs_fcgi.h xs_html.h snac.h \
+ http_codes.h
+main.o: main.c xs.h xs_io.h xs_json.h xs_time.h xs_openssl.h snac.h \
+ http_codes.h
 mastoapi.o: mastoapi.c xs.h xs_hex.h xs_openssl.h xs_json.h xs_io.h \
  xs_time.h xs_glob.h xs_set.h xs_random.h xs_url.h xs_mime.h xs_match.h \
- snac.h
-snac.o: snac.c xs.h xs_hex.h xs_io.h xs_unicode.h xs_json.h xs_curl.h \
- xs_openssl.h xs_socket.h xs_url.h xs_httpd.h xs_mime.h xs_regex.h \
- xs_set.h xs_time.h xs_glob.h xs_random.h xs_match.h xs_fcgi.h xs_html.h \
- snac.h
-upgrade.o: upgrade.c xs.h xs_io.h xs_json.h xs_glob.h snac.h
+ snac.h http_codes.h
+snac.o: snac.c xs.h xs_hex.h xs_io.h xs_unicode_tbl.h xs_unicode.h \
+ xs_json.h xs_curl.h xs_openssl.h xs_socket.h xs_unix_socket.h xs_url.h \
+ xs_httpd.h xs_mime.h xs_regex.h xs_set.h xs_time.h xs_glob.h xs_random.h \
+ xs_match.h xs_fcgi.h xs_html.h snac.h http_codes.h
+upgrade.o: upgrade.c xs.h xs_io.h xs_json.h xs_glob.h snac.h http_codes.h
 utils.o: utils.c xs.h xs_io.h xs_json.h xs_time.h xs_openssl.h \
- xs_random.h xs_glob.h xs_curl.h xs_regex.h snac.h
-webfinger.o: webfinger.c xs.h xs_json.h xs_curl.h xs_mime.h snac.h
+ xs_random.h xs_glob.h xs_curl.h xs_regex.h snac.h http_codes.h
+webfinger.o: webfinger.c xs.h xs_json.h xs_curl.h xs_mime.h snac.h \
+ http_codes.h