/*++\r
\r
-Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved\r
-This software and associated documentation (if any) is furnished\r
-under a license and may only be used or copied in accordance\r
-with the terms of the license. Except as permitted by such\r
-license, no part of this software or documentation may be\r
-reproduced, stored in a retrieval system, or transmitted in any\r
-form or by any means without the express written consent of\r
-Intel Corporation.\r
+Copyright (c) 1999-2006 Intel Corporation. All rights reserved\r
+This program and the accompanying materials are licensed and made available \r
+under the terms and conditions of the BSD License which accompanies this \r
+distribution. The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
\r
Module Name:\r
\r
#include <string.h>\r
#include <stdlib.h>\r
\r
-//\r
-// Includes for EFI 1.1 build\r
-//\r
-// #include "Tiano.h" // required defines for Compress.h\r
-// #include "EfiImage.h" // for PE32 structure definitions\r
-// #include "Compress.h" // for compression function\r
-// Includes for Tiano build\r
-//\r
-#include "TianoCommon.h"\r
-#include "EfiImage.h" // for PE32 structure definitions\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h> // for PE32 structure definitions\r
+#include <Common/MultiPhase.h>\r
+\r
+#include <IndustryStandard/pci22.h> // for option ROM header structures\r
+\r
#include "EfiCompress.h"\r
+#include "CommonLib.h"\r
\r
-//\r
-// END include differences\r
-//\r
-#include "Pci22.h" // for option ROM header structures\r
//\r
// Version of this utility\r
//\r