diff --git a/FSInject/FSInject.dec b/FSInject/FSInject.dec
index 4123f9e01..b4512b78e 100644
--- a/FSInject/FSInject.dec
+++ b/FSInject/FSInject.dec
@@ -11,7 +11,7 @@
   PACKAGE_VERSION = 0.1
 
 [Includes]
-#  ../Include
+  ../Include
   Include
 
 [Protocols]
diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h
new file mode 100644
index 000000000..87af840e7
--- /dev/null
+++ b/IntelFrameworkPkg/Include/FrameworkPei.h
@@ -0,0 +1,24 @@
+/** @file
+  Header file that support Framework extension to UEFI/PI for PEI modules.
+
+  This header file must include Framework extension definitions common to PEI
+  modules.
+
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
+SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#ifndef _FRAMEWORK_PEI_H_
+#define _FRAMEWORK_PEI_H_
+
+#include <PiPei.h>
+
+#include <Framework/FirmwareVolumeImageFormat.h>
+#include <Framework/FirmwareVolumeHeader.h>
+#include <Framework/Hob.h>
+#include <Framework/StatusCode.h>
+#include <Framework/BootScript.h>
+#include <Framework/PeiCis.h>
+
+#endif
diff --git a/IntelFrameworkPkg/Include/FrameworkSmm.h b/IntelFrameworkPkg/Include/FrameworkSmm.h
new file mode 100644
index 000000000..c10e6bc0b
--- /dev/null
+++ b/IntelFrameworkPkg/Include/FrameworkSmm.h
@@ -0,0 +1,18 @@
+/** @file
+  Header file that support Framework extensions to UEFI/PI for SMM modules.
+
+  This header file must include Framework extension definitions common to DXE
+  modules.
+
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
+SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#ifndef _FRAMEWORK_SMM_H_
+#define _FRAMEWORK_SMM_H_
+
+#include <FrameworkDxe.h>
+#include <Framework/SmmCis.h>
+
+#endif
diff --git a/Nasm.inc b/Nasm.inc
new file mode 100644
index 000000000..8db1da4bc
--- /dev/null
+++ b/Nasm.inc
@@ -0,0 +1,11 @@
+%macro SETSSBSY        0
+    DB 0xF3, 0x0F, 0x01, 0xE8
+%endmacro
+
+%macro READSSP_RAX     0
+    DB 0xF3, 0x48, 0x0F, 0x1E, 0xC8
+%endmacro
+
+%macro INCSSP_RAX      0
+    DB 0xF3, 0x48, 0x0F, 0xAE, 0xE8
+%endmacro
diff --git a/cbuild.bat b/cbuild.bat
index 082f9fc4a..04fd640c8 100644
--- a/cbuild.bat
+++ b/cbuild.bat
@@ -143,7 +143,7 @@ rem # setup build
   if defined EDK_TOOLS_BIN (
     set "BASETOOLS_DIR=%EDK_TOOLS_BIN%"
   )
-  set "NASM_INC=-I%WORKSPACE%\MdePkg\Include\X64"
+  set NASM_INC=
 
   rem # pass 1-call param
   if defined EDK_BUILDINFOS goto getEDKBuildInfos