diff --git a/Build/Chakra.Build.props b/Build/Chakra.Build.props
index a3c0dd5077a..8c3424e8ae9 100644
--- a/Build/Chakra.Build.props
+++ b/Build/Chakra.Build.props
@@ -50,7 +50,12 @@
       <RuntimeLibrary Condition="'$(Configuration)'=='Debug' AND '$(RuntimeLib)'=='static_library'">MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>
         $(ChakraCoreRootDirectory)\lib\common\placeholder;
-        $(IntDir)..\CoreManifests\
+        $(IntDir)..\CoreManifests;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(IntlICU)'=='true'">
+        $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
     </ClCompile>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4c55f6de69..3025cfc8103 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -456,7 +456,8 @@ include_directories(
     pal
     pal/inc
     pal/inc/rt
-    ${ICU_INCLUDE_PATH}
+    ${ICU_INCLUDE_PATH}/common
+    ${ICU_INCLUDE_PATH}/i18n
     )
 
 if(ICU_INCLUDE_PATH)
diff --git a/bin/ChakraCore/ChakraCore.vcxproj b/bin/ChakraCore/ChakraCore.vcxproj
index 0a515c6750c..76be641ca51 100644
--- a/bin/ChakraCore/ChakraCore.vcxproj
+++ b/bin/ChakraCore/ChakraCore.vcxproj
@@ -31,7 +31,6 @@
         $(ChakraCoreRootDirectory)Lib\Jsrt;
         $(IntDir);
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         $(MSBuildThisFileDirectory)..\..\lib\JITClient;
         %(AdditionalIncludeDirectories);
       </AdditionalIncludeDirectories>
diff --git a/lib/Backend/Chakra.Backend.vcxproj b/lib/Backend/Chakra.Backend.vcxproj
index 851a5cd52f2..03caa4e7f2e 100644
--- a/lib/Backend/Chakra.Backend.vcxproj
+++ b/lib/Backend/Chakra.Backend.vcxproj
@@ -36,7 +36,6 @@
         $(MSBuildThisFileDirectory)..\Parser;
         $(MSBuildThisFileDirectory)..\WasmReader;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -483,4 +482,4 @@
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
     <Import Project="$(BuildConfig_ARMASM_Path)armasm.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/JITServer/Chakra.JITServer.vcxproj b/lib/JITServer/Chakra.JITServer.vcxproj
index 04533d2e761..b81c60878a0 100644
--- a/lib/JITServer/Chakra.JITServer.vcxproj
+++ b/lib/JITServer/Chakra.JITServer.vcxproj
@@ -48,7 +48,6 @@
         $(MSBuildThisFileDirectory)..\Backend\$(PlatformPathNameAlt);
         $(MSBuildThisFileDirectory)..\Backend;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -57,4 +56,4 @@
   </ItemDefinitionGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/Jsrt/Chakra.Jsrt.vcxproj b/lib/Jsrt/Chakra.Jsrt.vcxproj
index fe85c35f640..852c37c8252 100644
--- a/lib/Jsrt/Chakra.Jsrt.vcxproj
+++ b/lib/Jsrt/Chakra.Jsrt.vcxproj
@@ -24,7 +24,6 @@
         $(MSBuildThisFileDirectory);
         $(MSBuildThisFileDirectory)..\Runtime;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         $(MSBuildThisFileDirectory)..\JITClient;
         $(MSBuildThisFileDirectory)..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\Common;
@@ -91,4 +90,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/Jsrt/Core/Chakra.Jsrt.Core.vcxproj b/lib/Jsrt/Core/Chakra.Jsrt.Core.vcxproj
index cd3144f8853..b87c054e19a 100644
--- a/lib/Jsrt/Core/Chakra.Jsrt.Core.vcxproj
+++ b/lib/Jsrt/Core/Chakra.Jsrt.Core.vcxproj
@@ -25,7 +25,6 @@
         $(MSBuildThisFileDirectory)..;
         $(MSBuildThisFileDirectory)..\..\Runtime;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\..\Common;
@@ -50,4 +49,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/Parser/Chakra.Parser.vcxproj b/lib/Parser/Chakra.Parser.vcxproj
index a0dd009ec9f..78e91591d9f 100644
--- a/lib/Parser/Chakra.Parser.vcxproj
+++ b/lib/Parser/Chakra.Parser.vcxproj
@@ -28,7 +28,6 @@
         $(MSBuildThisFileDirectory)..\Runtime;
         $(MSBuildThisFileDirectory)..\Runtime\ByteCode;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         $(ChakraManifestsIncludeDirectory);
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
diff --git a/lib/Runtime/Base/Chakra.Runtime.Base.vcxproj b/lib/Runtime/Base/Chakra.Runtime.Base.vcxproj
index cbbb1beaa0a..1f0735255de 100644
--- a/lib/Runtime/Base/Chakra.Runtime.Base.vcxproj
+++ b/lib/Runtime/Base/Chakra.Runtime.Base.vcxproj
@@ -28,7 +28,6 @@
         $(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\..\WasmReader;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
diff --git a/lib/Runtime/ByteCode/ByteCodeCacheReleaseFileVersion.h b/lib/Runtime/ByteCode/ByteCodeCacheReleaseFileVersion.h
index 3cb14e7e8a1..59803749d7a 100644
--- a/lib/Runtime/ByteCode/ByteCodeCacheReleaseFileVersion.h
+++ b/lib/Runtime/ByteCode/ByteCodeCacheReleaseFileVersion.h
@@ -4,6 +4,6 @@
 //-------------------------------------------------------------------------------------------------------
 // NOTE: If there is a merge conflict the correct fix is to make a new GUID.
 
-// {5C44723E-F7DF-4397-A24B-AC1A90D221F9}
+// {131ae129-1863-4b97-b9b2-4802d60acefb}
 const GUID byteCodeCacheReleaseFileVersion =
-{ 0x5C44723E, 0xF7DF, 0x4397, { 0xA2, 0x4B, 0xAC, 0x1A, 0x90, 0xD2, 0x21, 0xF9 } };
+{ 0x131ae129, 0x1863, 0x4b97, { 0xb9, 0xb2, 0x48, 0x02, 0xd6, 0x0a, 0xce, 0xfb } };
diff --git a/lib/Runtime/ByteCode/Chakra.Runtime.ByteCode.vcxproj b/lib/Runtime/ByteCode/Chakra.Runtime.ByteCode.vcxproj
index f96ec5aa7c7..236d302125c 100644
--- a/lib/Runtime/ByteCode/Chakra.Runtime.ByteCode.vcxproj
+++ b/lib/Runtime/ByteCode/Chakra.Runtime.ByteCode.vcxproj
@@ -29,7 +29,6 @@
         $(MSBuildThisFileDirectory)..\..\Backend;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -105,4 +104,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/Runtime/Debug/Chakra.Runtime.Debug.vcxproj b/lib/Runtime/Debug/Chakra.Runtime.Debug.vcxproj
index fbdf3e5e458..30b70018fb2 100644
--- a/lib/Runtime/Debug/Chakra.Runtime.Debug.vcxproj
+++ b/lib/Runtime/Debug/Chakra.Runtime.Debug.vcxproj
@@ -34,7 +34,6 @@
         $(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -113,4 +112,4 @@
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
     <Import Project="$(BuildConfig_ARMASM_Path)armasm.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/Runtime/Language/Chakra.Runtime.Language.vcxproj b/lib/Runtime/Language/Chakra.Runtime.Language.vcxproj
index 87749f4bbe7..57ba3da7fd0 100644
--- a/lib/Runtime/Language/Chakra.Runtime.Language.vcxproj
+++ b/lib/Runtime/Language/Chakra.Runtime.Language.vcxproj
@@ -35,7 +35,6 @@
         $(MSBuildThisFileDirectory)..\..\Runtime\Math;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -311,4 +310,4 @@
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
     <Import Project="$(BuildConfig_ARMASM_Path)armasm.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/Runtime/Library/Chakra.Runtime.Library.vcxproj b/lib/Runtime/Library/Chakra.Runtime.Library.vcxproj
index c425002d799..d5ad6befad6 100644
--- a/lib/Runtime/Library/Chakra.Runtime.Library.vcxproj
+++ b/lib/Runtime/Library/Chakra.Runtime.Library.vcxproj
@@ -34,7 +34,6 @@
         $(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common; <!-- // TODO (doilij): At end of IntlICU development, remove this if it is not needed here. -->
         $(MSBuildThisFileDirectory)..\Math;
         $(ChakraManifestsIncludeDirectory);
         $(ManifestsInboxIncludeDirectory);
diff --git a/lib/Runtime/Math/Chakra.Runtime.Math.vcxproj b/lib/Runtime/Math/Chakra.Runtime.Math.vcxproj
index 44903cc264e..db7f3340d0a 100644
--- a/lib/Runtime/Math/Chakra.Runtime.Math.vcxproj
+++ b/lib/Runtime/Math/Chakra.Runtime.Math.vcxproj
@@ -29,7 +29,6 @@
         $(MSBuildThisFileDirectory)..\..\Backend;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -69,4 +68,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/Runtime/PlatformAgnostic/Chakra.Runtime.PlatformAgnostic.vcxproj b/lib/Runtime/PlatformAgnostic/Chakra.Runtime.PlatformAgnostic.vcxproj
index 9925896752c..c0d1361b8aa 100644
--- a/lib/Runtime/PlatformAgnostic/Chakra.Runtime.PlatformAgnostic.vcxproj
+++ b/lib/Runtime/PlatformAgnostic/Chakra.Runtime.PlatformAgnostic.vcxproj
@@ -28,7 +28,6 @@
         $(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\..\Backend;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(MSBuildThisFileDirectory)..;$(MSBuildThisFileDirectory);
         %(AdditionalIncludeDirectories)
diff --git a/lib/Runtime/Types/Chakra.Runtime.Types.vcxproj b/lib/Runtime/Types/Chakra.Runtime.Types.vcxproj
index 3929ac2b0e1..7b953d210c3 100644
--- a/lib/Runtime/Types/Chakra.Runtime.Types.vcxproj
+++ b/lib/Runtime/Types/Chakra.Runtime.Types.vcxproj
@@ -29,7 +29,6 @@
         $(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -115,4 +114,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/WasmReader/Chakra.WasmReader.vcxproj b/lib/WasmReader/Chakra.WasmReader.vcxproj
index abe9c0ae1f8..be1660eaa6d 100644
--- a/lib/WasmReader/Chakra.WasmReader.vcxproj
+++ b/lib/WasmReader/Chakra.WasmReader.vcxproj
@@ -29,7 +29,6 @@
         $(MSBuildThisFileDirectory)..\Backend;
         $(MSBuildThisFileDirectory)..\JITClient;
         $(ChakraJITIDLIntDir);
-        $(IcuIncludeDir)\common;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -76,4 +75,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>