diff --git a/lib/setup.h b/lib/setup.h
index 1bc3235753dbd28f69c3ebda8ca4a23e4b2986ee..69f4227d1daf446353f2b7b83844cd5ea0b88808 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -35,9 +35,8 @@
 #define CURL_DISABLE_GOPHER
 #endif
 
-#if !defined(WIN32) && defined(_WIN32)
-/* This _might_ be a good Borland fix. Please report whether this works or
-   not! */
+#if !defined(WIN32) && defined(__WIN32__)
+/* This should be a good Borland fix. Alexander J. Oss told us! */
 #define WIN32
 #endif
 
diff --git a/src/setup.h b/src/setup.h
index 5cf5e678dd1eada2419080e58a4fe46b63b1d3d2..79539a693980c24c1f186f96f165a043cc2a1364 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -25,9 +25,8 @@
 
 #include <stdio.h>
 
-#if !defined(WIN32) && defined(_WIN32)
-/* This _might_ be a good Borland fix. Please report whether this works or
-   not! */
+#if !defined(WIN32) && defined(__WIN32__)
+/* Borland fix */
 #define WIN32
 #endif