diff -Naur wv/Makefile.in wv.mod/Makefile.in
--- wv/Makefile.in	Sat May  5 18:57:17 2001
+++ wv.mod/Makefile.in	Fri Jul 13 17:39:13 2001
@@ -287,25 +287,25 @@
 
 all: wvSummary$(EXEEXT) wvWare$(EXEEXT) wvRTF${EXEEXT} wvConvert$(EXEEXT) wvSimpleCLX$(EXEEXT) wvVersion$(EXEEXT) wv-libconfig wv-incconfig
 
-wvRTF$(EXEEXT): wvRTF.$(OBJEXT) $(GETOPT) OLEDECODE LIBOLE2 libwv.a
+wvRTF$(EXEEXT): wvRTF.$(OBJEXT) $(GETOPT) OLEDECODE BLIBOLE2 libwv.a
 	$(CC)  -o $@ wvRTF.$(OBJEXT) $(GETOPT) -L. -lwv $(LIBS) $(LDFLAGS)
 
-wvSummary$(EXEEXT): wvSummary.$(OBJEXT) $(GETOPT) OLEDECODE LIBOLE2 libwv.a 
+wvSummary$(EXEEXT): wvSummary.$(OBJEXT) $(GETOPT) OLEDECODE BLIBOLE2 libwv.a 
 	$(CC)  -o $@ wvSummary.$(OBJEXT) $(GETOPT) -L. -lwv $(LIBS) $(LDFLAGS)
 
-wvSimpleCLX$(EXEEXT): wvSimpleCLX.$(OBJEXT) $(GETOPT) OLEDECODE LIBOLE2 libwv.a
+wvSimpleCLX$(EXEEXT): wvSimpleCLX.$(OBJEXT) $(GETOPT) OLEDECODE BLIBOLE2 libwv.a
 	$(CC)  -o $@ wvSimpleCLX.$(OBJEXT) $(GETOPT) -L. -lwv $(LIBS) $(LDFLAGS)
 
-wvVersion$(EXEEXT): wvVersion.$(OBJEXT) $(GETOPT) OLEDECODE LIBOLE2 libwv.a
+wvVersion$(EXEEXT): wvVersion.$(OBJEXT) $(GETOPT) OLEDECODE BLIBOLE2 libwv.a
 	$(CC)  -o $@ wvVersion.$(OBJEXT) $(GETOPT) -L. -lwv $(LIBS) $(LDFLAGS)
 
-wvConvert$(EXEEXT): wvConvert.$(OBJEXT) $(GETOPT) OLEDECODE LIBOLE2 libwv.a
+wvConvert$(EXEEXT): wvConvert.$(OBJEXT) $(GETOPT) OLEDECODE BLIBOLE2 libwv.a
 	$(CC)  -o $@ wvConvert.$(OBJEXT) $(GETOPT) -L. -lwv $(LIBS) $(LDFLAGS)
 
-wvWare$(EXEEXT): wvWare.$(OBJEXT) $(GETOPT) OLEDECODE LIBOLE2 libwv.a
+wvWare$(EXEEXT): wvWare.$(OBJEXT) $(GETOPT) OLEDECODE BLIBOLE2 libwv.a
 	$(CC)  -o $@ wvWare.$(OBJEXT) $(GETOPT) -L. -lwv $(LIBS) $(LDFLAGS)
 
-wvGraphicConvert$(EXEEXT): wvGraphicConvert.$(OBJEXT) $(GETOPT) OLEDECODE LIBOLE2 libwv.a
+wvGraphicConvert$(EXEEXT): wvGraphicConvert.$(OBJEXT) $(GETOPT) OLEDECODE BLIBOLE2 libwv.a
 	$(CC)  -o $@ wvGraphicConvert.$(OBJEXT) $(GETOPT) -L. -lwv $(LIBS) $(LDFLAGS)
 
 wv-libconfig: Makefile
@@ -321,7 +321,7 @@
 lex.yy.c: parser.lex
 	$(LEX) parser.lex
 
-testparse$(EXEEXT):  testparse.$(OBJEXT) $(GETOPT) OLEDECODE LIBOLE2 libwv.a
+testparse$(EXEEXT):  testparse.$(OBJEXT) $(GETOPT) OLEDECODE BLIBOLE2 libwv.a
 	$(CC)  -o $@ testparse.$(OBJEXT) $(GETOPT) -L. -lwv $(LIBS)  $(LDFLAGS)
 
 error.$(OBJEXT): $(srcdir)/error.c Makefile
@@ -330,20 +330,20 @@
 laolareplace.$(OBJEXT): $(srcdir)/laolareplace.c 
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c 
 
-libwv.a:$(MYOBJECTS) $(EXPORTER) XMLPARSER $(ICONV) $(MAGICK) OLEDECODE LIBOLE2
+libwv.a:$(MYOBJECTS) $(EXPORTER) XMLPARSER $(ICONV) $(MAGICK) OLEDECODE BLIBOLE2
 	$(AR) rc $@ $(MYOBJECTS) $(EXPORTER_OBJECTS) $(ICONVOBJS) $(MAGICKOBJS) $(XML) $(OLE)
 
 	$(RANLIB) $@
 
-EXPORTER:
+BEXPORTER:
 	@echo making wvexporter in exporter
 	@(cd exporter && $(MAKE)) || exit 1
 
-ICONV:
+BICONV:
 	@echo making iconv in iconv
 	@(cd iconv && $(MAKE)) || exit 1
 
-MAGICK:
+BMAGICK:
 	@echo making magick in magick  
 	@(cd magick && $(MAKE)) || exit 1
 
@@ -361,16 +361,16 @@
 	@echo using system libxml... will not compile expat
 endif
 
-LIBOLE2:	GLIB-WV
+BLIBOLE2:	BGLIB-WV
 	@echo making libole2 in libole2
 	@(cd libole2 && $(MAKE)) || exit 1
 
 ifneq ($(HAVE_GLIB),1)
-GLIB-WV:
+BGLIB-WV:
 	@echo making glib-wv in glib-wv
 	@(cd glib-wv && $(MAKE)) || exit 1
 else
-GLIB-WV:
+BGLIB-WV:
 	@echo not making glib-wv... using system glib instead
 endif
 
diff -Naur wv/configure wv.mod/configure
--- wv/configure	Tue May  1 22:36:02 2001
+++ wv.mod/configure	Fri Jul 13 17:39:50 2001
@@ -2182,7 +2182,7 @@
   if test x$withval = xno; then
 	EXPORTER=
    else
-	EXPORTER=EXPORTER
+	EXPORTER=BEXPORTER
    fi
 
 fi
@@ -3025,7 +3025,7 @@
   echo "$ac_t""no" 1>&6
 
         ICONVOBJS="\$(RICONVOBJS)"
-        ICONV="ICONV"
+        ICONV="BICONV"
         echo "configure: warning: *** Get Iconv ***" 1>&2
 fi
 
@@ -3110,7 +3110,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -3189,7 +3189,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -3268,7 +3268,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -3347,7 +3347,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -3426,7 +3426,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -3505,7 +3505,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -3584,7 +3584,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -3663,7 +3663,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -3742,7 +3742,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 
@@ -3822,7 +3822,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -3901,7 +3901,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -3980,7 +3980,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -4059,7 +4059,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 	
@@ -4138,7 +4138,7 @@
 EOF
 
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 
 fi
@@ -4317,7 +4317,7 @@
   
             MAGICK_CFLAGS=$m_cppflags
             MAGICK_LIBS=$m_ldflags
-            MAGICK="MAGICK"
+            MAGICK="BMAGICK"
             MAGICKOBJS="\$(RMAGICKOBJS)"
 else
   echo "$ac_t""no" 1>&6
@@ -4330,7 +4330,7 @@
 fi
 
 if test -z "$MAGICK"; then
-	MAGICK="MAGICK"
+	MAGICK="BMAGICK"
 	MAGICK_CFLAGS="-I./magick"
 	MAGICK_LIBS=""
 	MAGICKOBJS="\$(RMAGICKOBJS)"
diff -Naur wv/configure.in wv.mod/configure.in
--- wv/configure.in	Tue May  1 22:36:02 2001
+++ wv.mod/configure.in	Fri Jul 13 17:39:34 2001
@@ -99,7 +99,7 @@
    if test x$withval = xno; then
 	EXPORTER=
    else
-	EXPORTER=EXPORTER
+	EXPORTER=BEXPORTER
    fi
 )
 
@@ -319,7 +319,7 @@
         AC_DEFINE(USE_ICONV)
         have_iconv=yes],[
         ICONVOBJS="\$(RICONVOBJS)"
-        ICONV="ICONV"
+        ICONV="BICONV"
         AC_MSG_WARN(*** Get Iconv ***)])
 fi
 
@@ -380,7 +380,7 @@
 if test $have_codepages = no; then
 AC_DEFINE(MUST_USE_INTERNAL_ICONV_TABLE)
 ICONVOBJS="\$(RICONVOBJS)"
-ICONV="ICONV"
+ICONV="BICONV"
 fi
 ])
 
@@ -460,12 +460,12 @@
         AC_CHECK_LIB(Magick, GetImageInfo,[
             MAGICK_CFLAGS=$m_cppflags
             MAGICK_LIBS=$m_ldflags
-            MAGICK="MAGICK"
+            MAGICK="BMAGICK"
             MAGICKOBJS="\$(RMAGICKOBJS)"]))
 fi
 
 if test -z "$MAGICK"; then
-	MAGICK="MAGICK"
+	MAGICK="BMAGICK"
 	MAGICK_CFLAGS="-I./magick"
 	MAGICK_LIBS=""
 	MAGICKOBJS="\$(RMAGICKOBJS)"
diff -Naur wv/expat/Makefile.in wv.mod/expat/Makefile.in
--- wv/expat/Makefile.in	Tue Nov 14 20:46:26 2000
+++ wv.mod/expat/Makefile.in	Fri Jul 13 17:39:13 2001
@@ -27,13 +27,13 @@
 
 .SUFFIXES: .C .o
 
-all: XMLTOK XMLPARSE
+all: BXMLTOK BXMLPARSE
 
-XMLTOK:
+BXMLTOK:
 	@echo making xmltok in xmltok
 	@(cd xmltok && $(MAKE)) || exit 1
 
-XMLPARSE:
+BXMLPARSE:
 	@echo making xmlparse in xmlparse
 	@(cd xmlparse && $(MAKE)) || exit 1