diff --git a/ChangeLog b/ChangeLog
index 525b4c6e1..b5117bee5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-24  Yves Blusseau  <blusseau@zetam.org>
+
+	* grub-core/lib/LzFind.c: Add missing include.
+	* grub-core/lib/LzmaEnc.c: Likewise.
+	* grub-core/script/lexer.c: Likewise.
+	* grub-core/script/yylex.l: Likewise.
+	* util/grub-macho2img.c: Likewise.
+	* util/grub-menulst2cfg.c: Likewise.
+	* util/grub-mklayout.c: Likewise.
+	* util/grub-mkpasswd-pbkdf2.c
+	* util/grub-mkrelpath.c: Likewise.
+	* util/resolve.c: Likewise.
+
 2010-09-24  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* Makefile.util.def (example_unit_test): Add
diff --git a/grub-core/lib/LzFind.c b/grub-core/lib/LzFind.c
index cd7a1cbab..d2bb15c65 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 842d43ac1..01ffa91f9 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 8d1623fb8..909b515fa 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 55620b6bd..53ae4c54f 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 23ffafb04..bce0a06d1 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 512239e89..e29c6b17c 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 ac59981c7..e90d955ff 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 d552d1acd..fe1887f8f 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 eccb49cdc..3fe3fe698 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 7eadffd38..63bd7ccb2 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>