basic + fundamental: Clean up includes

Split out of #37344.

src/fundamental/chid-fundamental.h

@@ -9,7 +9,6 @@
 #endif
 
 #include "efi-fundamental.h"
-#include "string-util-fundamental.h"
 
 #define CHID_TYPES_MAX 18
 /* Any chids starting from EXTRA_CHID_BASE are non-standard and are subject to change and renumeration at any time */

src/fundamental/edid-fundamental.c

@@ -1,5 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#if !SD_BOOT
+#include <endian.h>
+#endif
+
 #include "edid-fundamental.h"
 #include "efivars-fundamental.h"
 

src/fundamental/edid-fundamental.h

@@ -5,13 +5,12 @@
 #  include "efi-string.h"
 #  include "util.h"
 #else
-#  include <endian.h>
 #  include <stddef.h>
 #  include <stdint.h>
 #  include <uchar.h>
 #endif
 
-#include "string-util-fundamental.h"
+#include "macro-fundamental.h"
 
 /* EDID structure, version 1.4 */
 typedef struct EdidHeader {

src/fundamental/sha256-fundamental.c

@@ -28,7 +28,6 @@
 #endif
 
 #include "assert-fundamental.h"
-#include "macro-fundamental.h"
 #include "memory-util-fundamental.h"
 #include "sha256-fundamental.h"
 #include "unaligned-fundamental.h"

src/fundamental/string-util-fundamental.c

@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#if !SD_BOOT
-#  include <ctype.h>
-#endif
-
 #include "macro-fundamental.h"
 #include "string-util-fundamental.h"
 

src/fundamental/tpm2-pcr.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "macro-fundamental.h"
-
 /* The various TPM PCRs we measure into from sd-stub and sd-boot. */
 
 enum {

src/fundamental/uki.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "macro-fundamental.h"
+#include <stdbool.h>
 
 /* List of PE sections that have special meaning for us in unified kernels. This is the canonical order in
  * which we measure the sections into TPM PCR 11. PLEASE DO NOT REORDER! */