diff --git a/ChangeLog b/ChangeLog
index c3d7a6f0d..e622b6da5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Don't export grub_gate_a20.
+
+	* grub-core/kern/i386/pc/init.c: Remove leftovers.
+	* grub-core/kern/i386/pc/startup.S (FUNCTION(grub_gate_a20)): Rename
+	to ...
+	(grub_gate_a20): ... this. All users updated.
+	* include/grub/i386/pc/init.h: Removed. All users updated.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Create euro.pf2 which supports most European languages.
diff --git a/grub-core/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c
index 57e33569e..fc247a0d0 100644
--- a/grub-core/kern/i386/pc/init.c
+++ b/grub-core/kern/i386/pc/init.c
@@ -19,7 +19,7 @@
 #include <grub/kernel.h>
 #include <grub/mm.h>
 #include <grub/machine/boot.h>
-#include <grub/machine/init.h>
+#include <grub/i386/floppy.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/console.h>
 #include <grub/machine/kernel.h>
@@ -171,11 +171,6 @@ grub_machine_init (void)
   if (grub_lower_mem < GRUB_MEMORY_MACHINE_RESERVED_END)
     grub_fatal ("too small memory");
 
-#if 0
-  /* Turn on Gate A20 to access >1MB.  */
-  grub_gate_a20 (1);
-#endif
-
 /* FIXME: This prevents loader/i386/linux.c from using low memory.  When our
    heap implements support for requesting a chunk in low memory, this should
    no longer be a problem.  */
diff --git a/grub-core/kern/i386/pc/mmap.c b/grub-core/kern/i386/pc/mmap.c
index b174bc441..dba69bbcb 100644
--- a/grub-core/kern/i386/pc/mmap.c
+++ b/grub-core/kern/i386/pc/mmap.c
@@ -16,9 +16,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/machine/init.h>
-#include <grub/machine/int.h>
 #include <grub/machine/memory.h>
+#include <grub/machine/int.h>
 #include <grub/err.h>
 #include <grub/types.h>
 #include <grub/misc.h>
diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
index 9b53deeb2..2a78bc76f 100644
--- a/grub-core/kern/i386/pc/startup.S
+++ b/grub-core/kern/i386/pc/startup.S
@@ -202,7 +202,7 @@ LOCAL (codestart):
 	.code32
 
 	incl	%eax
-	call	EXT_C(grub_gate_a20)
+	call	grub_gate_a20
 
 #ifdef ENABLE_LZMA
 	movl	$GRUB_MEMORY_MACHINE_DECOMPRESSION_ADDR, %edi
@@ -292,7 +292,7 @@ VARIABLE(grub_boot_drive)
  * It also eats any keystrokes in the keyboard buffer.  :-(
  */
 
-FUNCTION(grub_gate_a20)
+grub_gate_a20:	
 	movl	%eax, %edx
 
 gate_a20_test_current_state:
@@ -478,7 +478,7 @@ FUNCTION(grub_chainloader_real_boot)
 
 	/* Turn off Gate A20 */
 	xorl	%eax, %eax
-	call	EXT_C(grub_gate_a20)
+	call	grub_gate_a20
 
 	/* set up to pass boot drive */
 	popl	%edx
diff --git a/grub-core/loader/i386/pc/chainloader.c b/grub-core/loader/i386/pc/chainloader.c
index e76f84f08..0ae94eaf8 100644
--- a/grub-core/loader/i386/pc/chainloader.c
+++ b/grub-core/loader/i386/pc/chainloader.c
@@ -26,13 +26,13 @@
 #include <grub/disk.h>
 #include <grub/misc.h>
 #include <grub/types.h>
-#include <grub/machine/init.h>
 #include <grub/partition.h>
 #include <grub/machine/memory.h>
 #include <grub/dl.h>
 #include <grub/command.h>
 #include <grub/msdos_partition.h>
 #include <grub/machine/biosnum.h>
+#include <grub/cpu/floppy.h>
 #include <grub/i18n.h>
 #include <grub/video.h>
 #include <grub/mm.h>
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
index 2f5dfec70..8e9a1b630 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -25,7 +25,6 @@
 #include <grub/disk.h>
 #include <grub/misc.h>
 #include <grub/types.h>
-#include <grub/machine/init.h>
 #include <grub/machine/memory.h>
 #include <grub/dl.h>
 #include <grub/cpu/linux.h>
diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
deleted file mode 100644
index 4005a1772..000000000
--- a/include/grub/i386/pc/init.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2004,2005,2007,2008  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GRUB_INIT_MACHINE_HEADER
-#define GRUB_INIT_MACHINE_HEADER	1
-
-#include <grub/types.h>
-#include <grub/symbol.h>
-#include <grub/machine/memory.h>
-#include <grub/cpu/floppy.h>
-
-/* Turn on/off Gate A20.  */
-void grub_gate_a20 (int on);
-
-#endif /* ! GRUB_INIT_MACHINE_HEADER */