diff --git a/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c b/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c
index a2276bfb2f..112f20e052 100644
--- a/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c
+++ b/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c
@@ -137,7 +137,6 @@ IterateVariablesInBuffer (
   )
 {
   RETURN_STATUS Status;
-  UINTN         Count;
   UINTN         TotalSizeUsed;
   UINTN         SizeUsed;
 
@@ -160,7 +159,7 @@ IterateVariablesInBuffer (
   Data = NULL;
 
   for (
-    Status = EFI_SUCCESS, Count = 0, TotalSizeUsed = 0;
+    Status = EFI_SUCCESS, TotalSizeUsed = 0;
     !EFI_ERROR (Status) && (TotalSizeUsed < MaxSize);
     ) {
     Status = UnpackVariableFromBuffer (
diff --git a/OvmfPkg/PlatformPei/Fv.c b/OvmfPkg/PlatformPei/Fv.c
index c812b3a9ac..f389e277c9 100644
--- a/OvmfPkg/PlatformPei/Fv.c
+++ b/OvmfPkg/PlatformPei/Fv.c
@@ -1,7 +1,7 @@
 /** @file
   Build FV related hobs for platform.
 
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2011, 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
   which accompanies this distribution.  The full text of the license may be found at
@@ -33,8 +33,6 @@ PeiFvInitialization (
   VOID
   )
 {
-  EFI_PHYSICAL_ADDRESS        FdBase;
-
   DEBUG ((EFI_D_ERROR, "Platform PEI Firmware Volume Initialization\n"));
 
   DEBUG (
@@ -44,7 +42,6 @@ PeiFvInitialization (
       )
     );
 
-  FdBase = PcdGet32 (PcdOvmfMemFvBase) - PcdGet32 (PcdVariableStoreSize) - PcdGet32 (PcdFlashNvStorageFtwSpareSize);
   BuildFvHob (PcdGet32 (PcdOvmfMemFvBase), PcdGet32 (PcdOvmfMemFvSize));
 
   //
diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c
index c13abe0aec..3882dadd63 100644
--- a/OvmfPkg/Sec/SecMain.c
+++ b/OvmfPkg/Sec/SecMain.c
@@ -98,11 +98,9 @@ FindMainFv (
 {
   EFI_FIRMWARE_VOLUME_HEADER  *Fv;
   UINTN                       Distance;
-  BOOLEAN                     Found;
 
   ASSERT (((UINTN) *BootFv & EFI_PAGE_MASK) == 0);
 
-  Found = FALSE;
   Fv = *BootFv;
   Distance = (UINTN) (*BootFv)->FvLength;
   do {