From Lars Roland: we need to define _NEED_VAR_IMPORT_ in plugins if we

link the plugins with libethereal, so do so.

svn path=/trunk/; revision=12176

20 files changed, 40 insertions, 40 deletions

diff --git a/doc/README.plugins b/doc/README.plugins
index 05e255f011..cbc78078eb 100644
--- a/doc/README.plugins
+++ b/doc/README.plugins
@@ -152,7 +152,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -164,7 +164,7 @@ xxx.dll xxx.exp xxx.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) xxx.dll xxx.exp xxx.lib $(PDB_FILE)
+	rm -f $(OBJECTS) xxx.dll xxx.exp xxx.lib *.pdb
 
 distclean: clean
 
diff --git a/plugins/acn/Makefile.nmake b/plugins/acn/Makefile.nmake
index eff4ab8ab2..4ceba3aed1 100644
--- a/plugins/acn/Makefile.nmake
+++ b/plugins/acn/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ acn.dll acn.exp acn.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) acn.dll acn.exp acn.lib $(PDB_FILE)
+	rm -f $(OBJECTS) acn.dll acn.exp acn.lib *.pdb
 
 distclean: clean
diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake
index 2bdd33c41f..4e9da257d0 100644
--- a/plugins/artnet/Makefile.nmake
+++ b/plugins/artnet/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ artnet.dll artnet.exp artnet.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) artnet.dll artnet.exp artnet.lib $(PDB_FILE)
+	rm -f $(OBJECTS) artnet.dll artnet.exp artnet.lib *.pdb
 
 distclean: clean
diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index 62cd2584f8..73f83e74de 100644
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ asn1.dll asn1.exp asn1.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) asn1.dll asn1.exp asn1.lib $(PDB_FILE)
+	rm -f $(OBJECTS) asn1.dll asn1.exp asn1.lib *.pdb
 
 distclean: clean
diff --git a/plugins/ciscosm/Makefile.nmake b/plugins/ciscosm/Makefile.nmake
index 1bb8fddc9f..9fa83fa1a6 100644
--- a/plugins/ciscosm/Makefile.nmake
+++ b/plugins/ciscosm/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ ciscosm.dll ciscosm.exp ciscosm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) ciscosm.dll ciscosm.exp ciscosm.lib $(PDB_FILE)
+	rm -f $(OBJECTS) ciscosm.dll ciscosm.exp ciscosm.lib *.pdb
 
 distclean: clean
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index bb7d7814e3..79114fe571 100644
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -37,6 +37,6 @@ docsis.dll docsis.exp docsis.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) docsis.dll docsis.exp docsis.lib $(PDB_FILE)
+	rm -f $(OBJECTS) docsis.dll docsis.exp docsis.lib *.pdb
 
 distclean: clean
diff --git a/plugins/enttec/Makefile.nmake b/plugins/enttec/Makefile.nmake
index c59c90c46c..48e8132bed 100644
--- a/plugins/enttec/Makefile.nmake
+++ b/plugins/enttec/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ enttec.dll enttec.exp enttec.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) enttec.dll enttec.exp enttec.lib $(PDB_FILE)
+	rm -f $(OBJECTS) enttec.dll enttec.exp enttec.lib *.pdb
 
 distclean: clean
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index 35be3bffa5..1a9bbde5c7 100644
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -32,6 +32,6 @@ coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj $(L
 
 clean:
 	rm -f $(OBJECTS) cosnaming.dll cosnaming.exp cosnaming.lib \
-		coseventcomm.dll coseventcomm.exp coseventcomm.lib $(PDB_FILE)
+		coseventcomm.dll coseventcomm.exp coseventcomm.lib *.pdb
 
 distclean: clean
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index d849d3191d..3ccaecd68a 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ gryphon.dll gryphon.exp gryphon.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib $(PDB_FILE)
+	rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib *.pdb
 
 distclean: clean
diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake
index 2ba66ecbe0..94fd393261 100644
--- a/plugins/irda/Makefile.nmake
+++ b/plugins/irda/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ irda.dll irda.exp irda.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) irda.dll irda.exp irda.lib $(PDB_FILE)
+	rm -f $(OBJECTS) irda.dll irda.exp irda.lib *.pdb
 
 distclean: clean
diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake
index d3ce47a21b..b89d11154a 100644
--- a/plugins/lwres/Makefile.nmake
+++ b/plugins/lwres/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ lwres.dll lwres.exp lwres.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) lwres.dll lwres.exp lwres.lib $(PDB_FILE)
+	rm -f $(OBJECTS) lwres.dll lwres.exp lwres.lib *.pdb
 
 distclean: clean
diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake
index daa9947e2f..19efb9dc40 100644
--- a/plugins/megaco/Makefile.nmake
+++ b/plugins/megaco/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ megaco.dll megaco.exp megaco.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib $(PDB_FILE)
+	rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib *.pdb
 
 distclean: clean
diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index b2104b1831..ff575af6cd 100644
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ mgcp.dll mgcp.exp mgcp.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib $(PDB_FILE)
+	rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib *.pdb
 
 distclean: clean
diff --git a/plugins/opsi/Makefile.nmake b/plugins/opsi/Makefile.nmake
index c185d37412..9840c8e090 100644
--- a/plugins/opsi/Makefile.nmake
+++ b/plugins/opsi/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ opsi.dll opsi.exp opsi.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) opsi.dll opsi.exp opsi.lib $(PDB_FILE)
+	rm -f $(OBJECTS) opsi.dll opsi.exp opsi.lib *.pdb
 
 distclean: clean
diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake
index 1241cc4246..c0cbc55661 100644
--- a/plugins/pcli/Makefile.nmake
+++ b/plugins/pcli/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ pcli.dll pcli.exp pcli.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) pcli.dll pcli.exp pcli.lib $(PDB_FILE)
+	rm -f $(OBJECTS) pcli.dll pcli.exp pcli.lib *.pdb
 
 distclean: clean
diff --git a/plugins/rdm/Makefile.nmake b/plugins/rdm/Makefile.nmake
index 9c6ddc7524..803243cd36 100644
--- a/plugins/rdm/Makefile.nmake
+++ b/plugins/rdm/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ rdm.dll rdm.exp rdm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) rdm.dll rdm.exp rdm.lib $(PDB_FILE)
+	rm -f $(OBJECTS) rdm.dll rdm.exp rdm.lib *.pdb
 
 distclean: clean
diff --git a/plugins/rlm/Makefile.nmake b/plugins/rlm/Makefile.nmake
index 86306a2891..a8aef8fa7d 100644
--- a/plugins/rlm/Makefile.nmake
+++ b/plugins/rlm/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ rlm.dll rlm.exp rlm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) rlm.dll rlm.exp rlm.lib $(PDB_FILE)
+	rm -f $(OBJECTS) rlm.dll rlm.exp rlm.lib *.pdb
 
 distclean: clean
diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake
index 698607e006..f3bf512ede 100644
--- a/plugins/rtnet/Makefile.nmake
+++ b/plugins/rtnet/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ rtnet.dll rtnet.exp rtnet.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib $(PDB_FILE)
+	rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib *.pdb
 
 distclean: clean
diff --git a/plugins/rudp/Makefile.nmake b/plugins/rudp/Makefile.nmake
index e7440ed41f..c61f235551 100644
--- a/plugins/rudp/Makefile.nmake
+++ b/plugins/rudp/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ rudp.dll rudp.exp rudp.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) rudp.dll rudp.exp rudp.lib $(PDB_FILE)
+	rm -f $(OBJECTS) rudp.dll rudp.exp rudp.lib *.pdb
 
 distclean: clean
diff --git a/plugins/v5ua/Makefile.nmake b/plugins/v5ua/Makefile.nmake
index 3ee454fb44..bf04762ca2 100644
--- a/plugins/v5ua/Makefile.nmake
+++ b/plugins/v5ua/Makefile.nmake
@@ -13,7 +13,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 !IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
 !ELSE
 LINK_PLUGIN_WITH=..\plugin_api.obj
 !ENDIF
@@ -25,6 +25,6 @@ v5ua.dll v5ua.exp v5ua.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 	$(GLIB_LIBS)
 
 clean:
-	rm -f $(OBJECTS) v5ua.dll v5ua.exp v5ua.lib $(PDB_FILE)
+	rm -f $(OBJECTS) v5ua.dll v5ua.exp v5ua.lib *.pdb
 
 distclean: clean