diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
index f68c25e219..8f14cf6d3f 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
@@ -1,6 +1,7 @@
 /** @file
   Library functions which relates with booting.
 
+(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
 Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -956,7 +957,6 @@ BmFindUsbDevice (
   EFI_DEVICE_PATH_PROTOCOL  *UsbIoDevicePath;
   EFI_USB_IO_PROTOCOL       *UsbIo;
   UINTN                     Index;
-  UINTN                     UsbIoDevicePathSize;
   BOOLEAN                   Matched;
 
   ASSERT (UsbIoHandleCount != NULL);  
@@ -988,7 +988,6 @@ BmFindUsbDevice (
     UsbIoDevicePath = DevicePathFromHandle (UsbIoHandles[Index]);
     Matched         = FALSE;
     if (!EFI_ERROR (Status) && (UsbIoDevicePath != NULL)) {
-      UsbIoDevicePathSize = GetDevicePathSize (UsbIoDevicePath) - END_DEVICE_PATH_LENGTH;
 
       //
       // Compare starting part of UsbIoHandle's device path with ParentDevicePath.
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
index b3f57f56fa..bffbedaf84 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
@@ -1,6 +1,7 @@
 /** @file
   Library functions which relates with driver health.
 
+(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
 Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -295,7 +296,6 @@ EfiBootManagerGetDriverHealthInfo (
   EFI_STATUS                 Status;
   UINTN                      NumHandles;
   EFI_HANDLE                 *DriverHealthHandles;
-  EFI_DRIVER_HEALTH_STATUS   HealthStatus;
   UINTN                      DriverHealthIndex;
   EFI_HANDLE                 *Handles;
   UINTN                      HandleCount;
@@ -313,8 +313,6 @@ EfiBootManagerGetDriverHealthInfo (
   NumHandles              = 0;
   HandleCount             = 0;
 
-  HealthStatus = EfiDriverHealthStatusHealthy;
-
   Status = gBS->LocateHandleBuffer (
                   ByProtocol,
                   &gEfiDriverHealthProtocolGuid,
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
index 6ffb6676c4..c8898925e6 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -5,6 +5,7 @@
   After DxeCore finish DXE phase, gEfiBdsArchProtocolGuid->BdsEntry will be invoked
   to enter BDS phase.
 
+(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
 Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -144,7 +145,6 @@ BdsEnumerateBootOptions (
 {
   EFI_STATUS                            Status;
   EFI_BOOT_MANAGER_LOAD_OPTION          *BootOptions;
-  UINT16                                NonBlockNumber;
   UINTN                                 HandleCount;
   EFI_HANDLE                            *Handles;
   EFI_BLOCK_IO_PROTOCOL                 *BlkIo;
@@ -220,7 +220,6 @@ BdsEnumerateBootOptions (
   //
   // Parse simple file system not based on block io
   //
-  NonBlockNumber = 0;
   gBS->LocateHandleBuffer (
          ByProtocol,
          &gEfiSimpleFileSystemProtocolGuid,