diff --git a/BaseTools/ImageTool/GNUmakefile b/BaseTools/ImageTool/GNUmakefile
index 4cfa4f1a00..a69a3e5f30 100644
--- a/BaseTools/ImageTool/GNUmakefile
+++ b/BaseTools/ImageTool/GNUmakefile
@@ -7,7 +7,7 @@
 PROJECT = ImageTool
 OBJS    = $(PROJECT).o
 OBJS    += Image.o PeEmit.o PeScan.o ElfScan.o BinEmit.o
-OBJS    += BaseAlignment.o BaseBitOverflow.o UefiImageExtraActionLib.o
+OBJS    += UefiImageExtraActionLib.o
 OBJS    += PeCoffInit.o PeCoffInfo.o PeCoffLoad.o PeCoffRelocate.o PeCoffHii.o PeCoffDebug.o
 
 DEBUG    = 1
@@ -21,8 +21,7 @@ include $(OC_USER)/User/Makefile
 
 CFLAGS += -include Pcds.h -Werror
 
-VPATH  += ../../MdePkg/Library/BaseOverflowLib:$\
-          ../../MdePkg/Library/BasePeCoffLib2:$\
+VPATH  += ../../MdePkg/Library/BasePeCoffLib2:$\
 					../../MdePkg/Library/BaseUefiImageExtraActionLibNull
 
 Tools: Tool32 Tool64
diff --git a/OpenCorePkg b/OpenCorePkg
index 997ef4ae8f..c42343b6bf 160000
--- a/OpenCorePkg
+++ b/OpenCorePkg
@@ -1 +1 @@
-Subproject commit 997ef4ae8f53a4b7f67e12b8d19a05368e6c2728
+Subproject commit c42343b6bf3207ca0cb0145b46345da76627a3bb