diff --git a/include/sbat.h b/include/sbat.h
index ab2325b..39971d9 100644
--- a/include/sbat.h
+++ b/include/sbat.h
@@ -6,8 +6,6 @@
 #ifndef SBAT_H_
 #define SBAT_H_
 
-#include "shim.h"
-
 struct sbat_entry {
 	const CHAR8 *component_name;
 	const CHAR8 *component_generation;
diff --git a/sbat.c b/sbat.c
index f64d0f2..3eaecdb 100644
--- a/sbat.c
+++ b/sbat.c
@@ -3,7 +3,7 @@
  * sbat.c - parse SBAT data from the .sbat section data
  */
 
-#include "sbat.h"
+#include "shim.h"
 
 CHAR8 *
 get_sbat_field(CHAR8 *current, CHAR8 *end, const CHAR8 ** field, char delim)
diff --git a/shim.h b/shim.h
index 872f54d..337234e 100644
--- a/shim.h
+++ b/shim.h
@@ -139,6 +139,7 @@
 #include "include/peimage.h"
 #include "include/pe.h"
 #include "include/replacements.h"
+#include "include/sbat.h"
 #if defined(OVERRIDE_SECURITY_POLICY)
 #include "include/security_policy.h"
 #endif