diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcedda51..6e0ab0c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ elseif (WITH_LIBSODIUM)
         if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
             target_link_libraries (libzmq ssp)
         endif ()
-        set (HAVE_LIBSODIUM 1)
+        set (ZMQ_USE_LIBSODIUM 1)
         set (ZMQ_HAVE_CURVE 1)
     else ()
         message (FATAL_ERROR
diff --git a/builds/msvc/readme.txt b/builds/msvc/readme.txt
index aab26c61..34fbe8cd 100644
--- a/builds/msvc/readme.txt
+++ b/builds/msvc/readme.txt
@@ -1,3 +1,11 @@
+For building on Windows, use:
+
+     ./configure.bat
+     cd build
+     ./buildall.bat
+
+This requires that the CMD.EXE be created using the DevStudio Tools link to create a CMD.EXE windo.
+
 Visual Studio product and C++ compiler Versions:
 
 Visual C++ 2008 => Visual C++ 9
@@ -14,11 +22,6 @@ More info here:
 
 http://en.wikipedia.org/wiki/Visual_C%2B%2B
 
-
-For building Windows, use the buildall.bat script in this directory.
-
-It requires that the CMD.EXE be created using the DevStudio Tools link to create a CMD.EXE windo.
-
 If multiple DevStudio versions are installed on the machine, you can run buildall.bat on separate windows that each were created by the desired DevStudio target.
 
 If you prefer to build all versions (or several) at the same time, you should uncomment the specific version desired in buildall.bat to build them from a single window.
diff --git a/builds/msvc/vs2015/build.bat b/builds/msvc/vs2015/build.bat
deleted file mode 100644
index c249082d..00000000
--- a/builds/msvc/vs2015/build.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@ECHO OFF
-call ../build/buildbase.bat ..\vs2015\mysolution.sln 14
diff --git a/configure.ac b/configure.ac
index de83ba82..c7e1b526 100644
--- a/configure.ac
+++ b/configure.ac
@@ -439,7 +439,7 @@ if test "x$enable_curve" = "xno"; then
 elif test "x$with_libsodium" = "xyes"; then
     AC_MSG_NOTICE([Using libsodium for CURVE security])
     AC_DEFINE(ZMQ_HAVE_CURVE, [1], [Using curve encryption])
-    AC_DEFINE(HAVE_LIBSODIUM, [1], [Using libsodium for curve encryption])
+    AC_DEFINE(ZMQ_USE_LIBSODIUM, [1], [Using libsodium for curve encryption])
     curve_library="libsodium"
 
     # On Solaris, libsodium depends on libssp
diff --git a/src/ctx.cpp b/src/ctx.cpp
index e99c0eb8..ef26419a 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -51,7 +51,7 @@
 
 #if defined (ZMQ_USE_TWEETNACL)
 #   include "tweetnacl.h"
-#elif defined (HAVE_LIBSODIUM)
+#elif defined (ZMQ_USE_LIBSODIUM)
 #   include "sodium.h"
 #endif
 
diff --git a/src/curve_client.hpp b/src/curve_client.hpp
index 8d177366..bc5c7670 100644
--- a/src/curve_client.hpp
+++ b/src/curve_client.hpp
@@ -36,7 +36,7 @@
 
 #if defined (ZMQ_USE_TWEETNACL)
 #   include "tweetnacl.h"
-#elif defined (HAVE_LIBSODIUM)
+#elif defined (ZMQ_USE_LIBSODIUM)
 #   include "sodium.h"
 #endif
 
diff --git a/src/curve_server.hpp b/src/curve_server.hpp
index 671792d7..8e2734aa 100644
--- a/src/curve_server.hpp
+++ b/src/curve_server.hpp
@@ -36,7 +36,7 @@
 
 #if defined (ZMQ_USE_TWEETNACL)
 #   include "tweetnacl.h"
-#elif defined (HAVE_LIBSODIUM)
+#elif defined (ZMQ_USE_LIBSODIUM)
 #   include "sodium.h"
 #endif
 
diff --git a/src/zmq_utils.cpp b/src/zmq_utils.cpp
index 51b0e490..a3479624 100644
--- a/src/zmq_utils.cpp
+++ b/src/zmq_utils.cpp
@@ -46,7 +46,7 @@
 
 #if defined (ZMQ_USE_TWEETNACL)
 #   include "tweetnacl.h"
-#elif defined (HAVE_LIBSODIUM)
+#elif defined (ZMQ_USE_LIBSODIUM)
 #   include "sodium.h"
 #endif