From d976fc51e140521d8b9cde473b5715b12320fa69 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Sat, 28 Oct 2006 14:00:05 +0000
Subject: [PATCH] 2006-10-28  Yoshinori K. Okuji  <okuji@enbug.org>

        * normal/menu.c: Include grub/script.h.
        * normal/menu_entry.c: Likewise.
        * include/grub/normal.h: Do not include grub/script.h.
---
 ChangeLog             | 6 ++++++
 include/grub/normal.h | 1 -
 normal/menu.c         | 1 +
 normal/menu_entry.c   | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf08be842..e3a62d942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-28  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* normal/menu.c: Include grub/script.h.
+	* normal/menu_entry.c: Likewise.
+	* include/grub/normal.h: Do not include grub/script.h.
+
 2006-10-27  Hollis Blanchard  <hollis@penguinppc.org>
 
 	* kern/disk.c (grub_disk_read): Correct debug printf formatting.
diff --git a/include/grub/normal.h b/include/grub/normal.h
index 898cfa350..ecca40cb0 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -25,7 +25,6 @@
 #include <grub/symbol.h>
 #include <grub/err.h>
 #include <grub/arg.h>
-#include <grub/script.h>
 
 /* The maximum size of a command-line.  */
 #define GRUB_MAX_CMDLINE	1600
diff --git a/normal/menu.c b/normal/menu.c
index b712581ab..967b308b2 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -24,6 +24,7 @@
 #include <grub/mm.h>
 #include <grub/machine/time.h>
 #include <grub/env.h>
+#include <grub/script.h>
 
 static void
 draw_border (void)
diff --git a/normal/menu_entry.c b/normal/menu_entry.c
index 1690c77a9..9bc6bba1e 100644
--- a/normal/menu_entry.c
+++ b/normal/menu_entry.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2006  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/loader.h>
+#include <grub/script.h>
 
 enum update_mode
   {