diff --git a/bin/xbps-digest/main.c b/bin/xbps-digest/main.c
index 8fb1161c..076ad1ef 100644
--- a/bin/xbps-digest/main.c
+++ b/bin/xbps-digest/main.c
@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include <xbps_api.h>
+#include "sha256.h"
 
 static void
 usage(void)
diff --git a/include/xbps_api.h b/include/xbps_api.h
index 3af4d5e9..8d3267f9 100644
--- a/include/xbps_api.h
+++ b/include/xbps_api.h
@@ -36,8 +36,6 @@
 #include <archive.h>
 #include <archive_entry.h>
 
-#include "sha256.h"
-
 /* Current release version */
 #define XBPS_RELVER		"0.2.99.1"
 
diff --git a/lib/sha256.c b/lib/sha256.c
index 06fffec1..b73eafc7 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -48,7 +48,8 @@
 #include <inttypes.h>
 #include <libgen.h>
 
-#include "xbps_api.h"
+#include <xbps_api.h>
+#include "sha256.h"
 
 /*** SHA-256 Various Length Definitions ***********************/
 /* NOTE: Most of these are in sha2.h */
diff --git a/lib/util.c b/lib/util.c
index 2e5c81be..bc52bc87 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -34,6 +34,7 @@
 #include <sys/utsname.h>
 
 #include <xbps_api.h>
+#include "sha256.h"
 
 static bool	question(bool, const char *, va_list);