diff --git a/EdkNt32Pkg/Sec/SecMain_build.xml b/EdkNt32Pkg/Sec/SecMain_build.xml
index 56b2635005..12b1a94419 100644
--- a/EdkNt32Pkg/Sec/SecMain_build.xml
+++ b/EdkNt32Pkg/Sec/SecMain_build.xml
@@ -99,6 +99,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <target name="sections" />
 
     <target name="output" >
+      <if>
+        <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
+        <then>
+          <var name="SLINK_FLAGS" value="${SLINK_FLAGS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
+        </then>
+      </if>
       <OnDependency>
         <sourcefiles>
           <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />
diff --git a/EdkNt32Pkg/Sec/WinNtThunk.c b/EdkNt32Pkg/Sec/WinNtThunk.c
index d064fae73d..2832e13fdd 100644
--- a/EdkNt32Pkg/Sec/WinNtThunk.c
+++ b/EdkNt32Pkg/Sec/WinNtThunk.c
@@ -45,6 +45,7 @@ Abstract:
 //  to tell if all the elements have been initailized properly.
 //
 #pragma warning(disable : 4232)
+#pragma warning(disable : 4996)
 
 EFI_WIN_NT_THUNK_PROTOCOL mWinNtThunkTable = {
   EFI_WIN_NT_THUNK_PROTOCOL_SIGNATURE,
@@ -137,7 +138,7 @@ EFI_WIN_NT_THUNK_PROTOCOL mWinNtThunkTable = {
   PurgeComm,
   SetCommTimeouts,
   ExitProcess,
-  swprintf,
+  _snwprintf,
   GetDesktopWindow,
   GetForegroundWindow,
   CreateWindowEx,
@@ -173,6 +174,7 @@ EFI_WIN_NT_THUNK_PROTOCOL mWinNtThunkTable = {
   HeapFree
 };
 
+#pragma warning(default : 4996)
 #pragma warning(default : 4232)
 
 EFI_WIN_NT_THUNK_PROTOCOL *gWinNt = &mWinNtThunkTable;