diff --git a/src/unique_path.cpp b/src/unique_path.cpp
index d88cbb8..1b05c83 100644
--- a/src/unique_path.cpp
+++ b/src/unique_path.cpp
@@ -28,7 +28,9 @@
 # else // BOOST_WINDOWS_API
 #   include <windows.h>
 #   include <wincrypt.h>
-#   pragma comment(lib, "Advapi32.lib")
+#   ifdef _MSC_VER
+#      pragma comment(lib, "Advapi32.lib")
+#   endif
 # endif
 
 namespace {
diff --git a/test/operations_test.cpp b/test/operations_test.cpp
index 400b12b..b5ac8b4 100644
--- a/test/operations_test.cpp
+++ b/test/operations_test.cpp
@@ -56,7 +56,7 @@ inline std::wstring convert(const char* c)
    return std::wstring(s.begin(), s.end());
 }
 
-#if defined(_MSC_VER) || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#if defined(_MSC_VER)
 //  Note: these three setenv* functions are not general solutions for the missing
 //  setenv* problem on VC++. See Microsoft's _putenv for that need, and ticker #7018
 //  for discussion and rationale for returning void for this test program, which needs