4 files changed, 21 insertions, 31 deletions
diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index fd724f6..f345fca 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -2,7 +2,7 @@
 # Component description file for Base Library
 #
 # Base Library implementation.
-# Copyright (c) 2007, Intel Corporation.
+# Copyright (c) 2007 - 2008, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -353,7 +353,7 @@
   Ia32/LShiftU64.S | GCC 
   SynchronizationGcc.c  | GCC
 
-  Ia32/DivS64x64Remainder.c
+  Ia32DivS64x64Remainder.c
   Ia32/InternalSwitchStack.c
   Ia32/Non-existing.c
   Unaligned.c
diff --git a/MdePkg/Library/BaseLib/Ia32/Non-existing.c b/MdePkg/Library/BaseLib/Ia32/Non-existing.c
index 96e90de..a83a168 100644
--- a/MdePkg/Library/BaseLib/Ia32/Non-existing.c
+++ b/MdePkg/Library/BaseLib/Ia32/Non-existing.c
@@ -1,7 +1,7 @@
 /** @file
   Non-existing BaseLib functions on Ia32
 
-  Copyright (c) 2006, Intel Corporation
+  Copyright (c) 2006 - 2008, Intel Corporation
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,13 +12,7 @@
 
 **/
 
-//
-// Include common header file for this module.
-//
-
-
-#include "../BaseLibInternals.h"
-
+#include <Library/DebugLib.h>
 
 /**
   Disables the 64-bit paging mode on the CPU.
@@ -34,16 +28,16 @@
   @param  CodeSelector  The 16-bit selector to load in the CS before EntryPoint
                         is called. The descriptor in the GDT that this selector
                         references must be setup for 32-bit protected mode.
-  @param  EntryPoint  The 64-bit virtual address of the function to call with
-                      the new stack after paging is disabled.
-  @param  Context1    The 64-bit virtual address of the context to pass into
-                      the EntryPoint function as the first parameter after
-                      paging is disabled.
-  @param  Context2    The 64-bit virtual address of the context to pass into
-                      the EntryPoint function as the second parameter after
-                      paging is disabled.
-  @param  NewStack    The 64-bit virtual address of the new stack to use for
-                      the EntryPoint function after paging is disabled.
+  @param  EntryPoint    The 64-bit virtual address of the function to call with
+                        the new stack after paging is disabled.
+  @param  Context1      The 64-bit virtual address of the context to pass into
+                        the EntryPoint function as the first parameter after
+                        paging is disabled.
+  @param  Context2      The 64-bit virtual address of the context to pass into
+                        the EntryPoint function as the second parameter after
+                        paging is disabled.
+  @param  NewStack      The 64-bit virtual address of the new stack to use for
+                        the EntryPoint function after paging is disabled.
 
 **/
 VOID
diff --git a/MdePkg/Library/BaseLib/Ia32DivS64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32DivS64x64Remainder.c
index 36b256f..6d3b5a4 100644
--- a/MdePkg/Library/BaseLib/Ia32DivS64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32DivS64x64Remainder.c
@@ -1,7 +1,7 @@
 /** @file
   Integer division worker functions for Ia32.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2008, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,12 +12,7 @@
 
 **/
 
-//
-// Include common header file for this module.
-//
-
-
-#include "../BaseLibInternals.h"
+#include "BaseLibInternals.h"
 
 /**
   Worker function that Divides a 64-bit signed integer by a 64-bit signed integer and
diff --git a/MdePkg/Library/BaseLib/X64/Non-existing.c b/MdePkg/Library/BaseLib/X64/Non-existing.c
index 4952916..9814cba 100644
--- a/MdePkg/Library/BaseLib/X64/Non-existing.c
+++ b/MdePkg/Library/BaseLib/X64/Non-existing.c
@@ -1,7 +1,7 @@
 /** @file
   Non-existing BaseLib functions on x64
 
-  Copyright (c) 2006, Intel Corporation
+  Copyright (c) 2006 - 2008, Intel Corporation
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,7 +12,8 @@
 
 **/
 
-#include "../BaseLibInternals.h"
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
 
 /**
   Enables the 32-bit paging mode on the CPU.
@@ -57,7 +58,7 @@ InternalX86EnablePaging32 (
   )
 {
   //
-  // This function cannot work on X64 platform
+  // This function cannot work on x64 platform
   //
   ASSERT (FALSE);
 }
@@ -102,7 +103,7 @@ InternalX86DisablePaging32 (
   )
 {
   //
-  // This function cannot work on X64 platform
+  // This function cannot work on x64 platform
   //
   ASSERT (FALSE);
 }