diff --git a/grub-core/lib/LzFind.c b/grub-core/lib/LzFind.c
index cd7a1cb..d2bb15c 100644
--- a/grub-core/lib/LzFind.c
+++ b/grub-core/lib/LzFind.c
@@ -24,6 +24,9 @@
  * See <http://www.7-zip.org>, for more information about LZMA.
  */
 
+
+#include <config.h>
+
 #include <string.h>
 
 #include <grub/lib/LzFind.h>
diff --git a/grub-core/lib/LzmaEnc.c b/grub-core/lib/LzmaEnc.c
index 842d43a..01ffa91 100644
--- a/grub-core/lib/LzmaEnc.c
+++ b/grub-core/lib/LzmaEnc.c
@@ -24,6 +24,8 @@
  * See <http://www.7-zip.org>, for more information about LZMA.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <string.h>
 
diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c
index 8d1623f..909b515 100644
--- a/grub-core/script/lexer.c
+++ b/grub-core/script/lexer.c
@@ -17,6 +17,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <grub/parser.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l
index 55620b6..53ae4c5 100644
--- a/grub-core/script/yylex.l
+++ b/grub-core/script/yylex.l
@@ -71,6 +71,8 @@ static void  copy_string (struct grub_parser_param *, const char *,
 
 %top{
 
+#include <config.h>
+
 #include <sys/types.h>
 
 typedef size_t yy_size_t;
diff --git a/util/grub-macho2img.c b/util/grub-macho2img.c
index 23ffafb..bce0a06 100644
--- a/util/grub-macho2img.c
+++ b/util/grub-macho2img.c
@@ -17,6 +17,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <grub/types.h>
 #include <grub/macho.h>
 #include <stdio.h>
diff --git a/util/grub-menulst2cfg.c b/util/grub-menulst2cfg.c
index 512239e..e29c6b1 100644
--- a/util/grub-menulst2cfg.c
+++ b/util/grub-menulst2cfg.c
@@ -16,6 +16,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <grub/legacy_parse.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/util/grub-mklayout.c b/util/grub-mklayout.c
index ac59981..e90d955 100644
--- a/util/grub-mklayout.c
+++ b/util/grub-mklayout.c
@@ -16,6 +16,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <grub/util/misc.h>
 #include <grub/i18n.h>
 #include <grub/term.h>
diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index d552d1a..fe1887f 100644
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -16,6 +16,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <grub/types.h>
 #include <grub/crypto.h>
 #include <grub/emu/misc.h>
diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
index eccb49c..3fe3fe6 100644
--- a/util/grub-mkrelpath.c
+++ b/util/grub-mkrelpath.c
@@ -17,6 +17,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <grub/util/misc.h>
 #include <grub/emu/misc.h>
diff --git a/util/resolve.c b/util/resolve.c
index 7eadffd..63bd7cc 100644
--- a/util/resolve.c
+++ b/util/resolve.c
@@ -16,6 +16,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>