diff --git a/vs2008/install_activate.bat b/vs2008/install_activate.bat
index d8727db81..3b30c5bd2 100644
--- a/vs2008/install_activate.bat
+++ b/vs2008/install_activate.bat
@@ -13,3 +13,5 @@ IF "%cross_compiler_target_platform%" == "win-64" (
   )
 
 echo CALL "%%VSINSTALLDIR%%\..\..\VC\vcvarsall.bat" %target_platform% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
+echo set INCLUDE=%%INCLUDE%%;%%LIBRARY_INC%% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
+echo set LIB=%%LIB%%;%%LIBRARY_LIB%% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
diff --git a/vs2010/install_activate.bat b/vs2010/install_activate.bat
index d4e069063..722b97c44 100644
--- a/vs2010/install_activate.bat
+++ b/vs2010/install_activate.bat
@@ -13,3 +13,5 @@ IF "%cross_compiler_target_platform%" == "win-64" (
   )
 
 echo CALL "%%VSINSTALLDIR%%\..\..\VC\vcvarsall.bat" %target_platform% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
+echo set INCLUDE=%%INCLUDE%%;%%LIBRARY_INC%% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
+echo set LIB=%%LIB%%;%%LIBRARY_LIB%% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
diff --git a/vs2015/install_activate.bat b/vs2015/install_activate.bat
index 625b3d726..13b47f751 100644
--- a/vs2015/install_activate.bat
+++ b/vs2015/install_activate.bat
@@ -13,3 +13,5 @@ IF "%cross_compiler_target_platform%" == "win-64" (
   )
 
 echo CALL "%%VSINSTALLDIR%%..\..\VC\vcvarsall.bat" %target_platform% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
+echo set INCLUDE=%%INCLUDE%%;%%LIBRARY_INC%% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
+echo set LIB=%%LIB%%;%%LIBRARY_LIB%% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
diff --git a/vs2017/install_activate.bat b/vs2017/install_activate.bat
index d603e66c1..74d3814f2 100644
--- a/vs2017/install_activate.bat
+++ b/vs2017/install_activate.bat
@@ -3,18 +3,18 @@ set VER=15
 
 mkdir "%PREFIX%\etc\conda\activate.d"
 COPY "%RECIPE_DIR%\activate.bat" "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
+echo pushd "%%VSINSTALLDIR%%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
 
 IF "%cross_compiler_target_platform%" == "win-64" (
   set "target_platform=amd64"
   echo SET "CMAKE_GENERATOR=Visual Studio %VER% %YEAR% Win64" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
-  echo pushd "%%VSINSTALLDIR%%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
   echo CALL "VC\Auxiliary\Build\vcvars64.bat" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
-  echo popd >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
   ) else (
   set "target_platform=x86"
   echo SET "CMAKE_GENERATOR=Visual Studio %VER% %YEAR%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
-  echo pushd "%%VSINSTALLDIR%%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
   echo CALL "VC\Auxiliary\Build\vcvars32.bat" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
-  echo popd >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
   )
 
+echo popd >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
+echo set INCLUDE=%%INCLUDE%%;%%LIBRARY_INC%% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
+echo set LIB=%%LIB%%;%%LIBRARY_LIB%% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"