diff --git a/cf/make-proto.pl b/cf/make-proto.pl
index 98220c254..ed24004de 100644
--- a/cf/make-proto.pl
+++ b/cf/make-proto.pl
@@ -308,7 +308,8 @@ extern \"C\" {
 if ($opt_E) {
     $public_h_header .= "#ifndef $opt_E
 #if defined(_WIN32)
-#define $opt_E _stdcall __declspec(dllimport)
+#define ${opt_E}_FUNCTION _stdcall __declspec(dllimport)
+#define ${opt_E}_VARIABLE __declspec(dllimport)
 #else
 #define $opt_E
 #endif
@@ -318,9 +319,11 @@ if ($opt_E) {
     
     $private_h_header .= "#ifndef $opt_E
 #if defined(_WIN32)
-#define $opt_E _stdcall __declspec(dllimport)
+#define ${opt_E}_FUNCTION _stdcall __declspec(dllimport)
+#define ${opt_E}_VARIABLE __declspec(dllimport)
 #else
-#define $opt_E
+#define ${opt_E}_FUNCTION
+#define ${opt_E}_VARIABLE
 #endif
 #endif