diff --git a/src/fundamental/chid-fundamental.c b/src/fundamental/chid-fundamental.c
index 55b04fa2ab..145bf408bc 100644
--- a/src/fundamental/chid-fundamental.c
+++ b/src/fundamental/chid-fundamental.c
@@ -15,12 +15,10 @@
  */
 
 #if SD_BOOT
-#  include "efi-string.h"
 #  include "util.h"
 #else
 #  include <byteswap.h>
 #  include <string.h>
-#  include <uchar.h>
 #  include <utf8.h>
 #define strsize16(str) ((char16_strlen(str) + 1) * sizeof(char16_t))
 #endif
diff --git a/src/fundamental/chid-fundamental.h b/src/fundamental/chid-fundamental.h
index e8c5c1add2..1e582932fd 100644
--- a/src/fundamental/chid-fundamental.h
+++ b/src/fundamental/chid-fundamental.h
@@ -2,6 +2,12 @@
 
 #pragma once
 
+#if SD_BOOT
+#  include "efi-string.h"
+#else
+#  include <uchar.h>
+#endif
+
 #include "efi-fundamental.h"
 #include "string-util-fundamental.h"