diff --git a/alloy.py b/alloy.py
index f88f2abf..2b2c82b5 100755
--- a/alloy.py
+++ b/alloy.py
@@ -292,6 +292,8 @@ def build_ispc(version_LLVM, make):
         p_temp = os.getenv("LLVM_INSTALL_DIR")
         v_temp = os.getenv("LLVM_VERSION")
         os.environ["LLVM_INSTALL_DIR"] = os.environ["LLVM_HOME"] + "\\bin-" + version_LLVM
+        if version_LLVM == "3.2":
+            temp = "3_2"
         if version_LLVM == "3.3":
             temp = "3_3"
         if version_LLVM == "3.4":
diff --git a/ispc.vcxproj b/ispc.vcxproj
index 8fa9be70..2ce69fde 100755
--- a/ispc.vcxproj
+++ b/ispc.vcxproj
@@ -105,7 +105,6 @@
     <ClInclude Include="sym.h" />
     <ClInclude Include="type.h" />
     <ClInclude Include="util.h" />
-    <ClInclude Include="winstuff\unistd.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="stdlib.ispc">
@@ -396,7 +395,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>NOMINMAX;%LLVM_VERSION%</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;.\winstuff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4146;4800;4996;4355;4624;4244</DisableSpecificWarnings>
     </ClCompile>
     <Link>
@@ -415,7 +414,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NOMINMAX;%LLVM_VERSION%</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;.\winstuff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4146;4800;4996;4355;4624;4244</DisableSpecificWarnings>
     </ClCompile>
     <Link>
@@ -431,4 +430,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/run_tests.py b/run_tests.py
index 89e6cd87..e33548b6 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -211,7 +211,7 @@ def run_test(testname):
                     obj_name = "%s.obj" % os.path.basename(filename)
                 exe_name = "%s.exe" % os.path.basename(filename)
 
-                cc_cmd = "%s /I. /I../winstuff /Zi /nologo /DTEST_SIG=%d %s %s /Fe%s" % \
+                cc_cmd = "%s /I. /Zi /nologo /DTEST_SIG=%d %s %s /Fe%s" % \
                          (options.compiler_exe, match, add_prefix("test_static.cpp"), obj_name, exe_name)
                 if should_fail:
                     cc_cmd += " /DEXPECT_FAILURE"
diff --git a/winstuff/stdint.h b/winstuff/stdint.h
deleted file mode 100644
index 7f3f8100..00000000
--- a/winstuff/stdint.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef MY_STDINT_H
-#define MY_STDINT_H 1
-
-typedef signed char int8_t;
-typedef signed __int16 int16_t;
-typedef signed __int32 int32_t;
-typedef signed __int64 int64_t;
-typedef unsigned char uint8_t;
-
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-
-#endif // MY_STDINT_H
diff --git a/winstuff/unistd.h b/winstuff/unistd.h
deleted file mode 100644
index f2f5dfae..00000000
--- a/winstuff/unistd.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MY_UNISTD_H
-#define MY_UNISTD_H 1
-
-inline bool isatty(int) { return false; }
-
-#endif // MY_UNISTD_H
\ No newline at end of file