diff --git a/expat/bcb5/elements.bpr b/expat/bcb5/elements.bpr
index aba8cab5..2e6d0005 100644
--- a/expat/bcb5/elements.bpr
+++ b/expat/bcb5/elements.bpr
@@ -42,7 +42,7 @@
   <LINKER>
     <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
     <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="$(LIBFILES) $(LIBRARIES) EXPAT.LIB import32.lib cw32i.lib"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib"/>
   </LINKER>
   <IDEOPTIONS>
 [Version Info]
@@ -139,4 +139,4 @@ ActiveLang=
 ProjectLang=
 RootDir=
   </IDEOPTIONS>
-</PROJECT>@
+</PROJECT>
diff --git a/expat/bcb5/elements.mak b/expat/bcb5/elements.mak
index bf33caca..8449c3be 100644
--- a/expat/bcb5/elements.mak
+++ b/expat/bcb5/elements.mak
@@ -50,7 +50,7 @@ LFLAGS = -Idebug\obj -D"" -ap -Tpe -x -Gn -v -q -L..\LIB\RELEASE
 # ---------------------------------------------------------------------------
 ALLOBJ = c0x32.obj $(OBJFILES)
 ALLRES = $(RESFILES)
-ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.LIB import32.lib cw32i.lib
+ALLLIB = $(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib
 # ---------------------------------------------------------------------------
 !ifdef IDEOPTIONS
 
diff --git a/expat/bcb5/expat.bpr b/expat/bcb5/expat.bpr
index 14f7fce5..51929868 100644
--- a/expat/bcb5/expat.bpr
+++ b/expat/bcb5/expat.bpr
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.05.03"/>
-    <PROJECT value="debug\expat.dll"/>
+    <PROJECT value="debug\libexpat.dll"/>
     <OBJFILES value="debug\obj\xmltok.obj debug\obj\xmlrole.obj debug\obj\xmlparse.obj"/>
     <RESFILES value=""/>
     <IDLFILES value=""/>
@@ -140,4 +140,4 @@ ActiveLang=
 ProjectLang=
 RootDir=
   </IDEOPTIONS>
-</PROJECT>@
+</PROJECT>
diff --git a/expat/bcb5/expat.mak b/expat/bcb5/expat.mak
index 6b0a2760..a83ec8a2 100644
--- a/expat/bcb5/expat.mak
+++ b/expat/bcb5/expat.mak
@@ -13,7 +13,7 @@ BCB = $(MAKEDIR)\..
 
 VERSION = BCB.05.03
 # ---------------------------------------------------------------------------
-PROJECT = debug\expat.dll
+PROJECT = debug\libexpat.dll
 OBJFILES = debug\obj\xmltok.obj debug\obj\xmlrole.obj debug\obj\xmlparse.obj
 RESFILES = 
 MAINSOURCE = expat.bpf
diff --git a/expat/bcb5/expatw.bpr b/expat/bcb5/expatw.bpr
index 1c16e300..6354f4a7 100644
--- a/expat/bcb5/expatw.bpr
+++ b/expat/bcb5/expatw.bpr
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.05.03"/>
-    <PROJECT value="debug\expatw.dll"/>
+    <PROJECT value="debug\libexpatw.dll"/>
     <OBJFILES value="debug\obj\xmltok.obj debug\obj\xmlrole.obj debug\obj\xmlparse.obj"/>
     <RESFILES value=""/>
     <IDLFILES value=""/>
@@ -141,4 +141,4 @@ ActiveLang=
 ProjectLang=
 RootDir=
   </IDEOPTIONS>
-</PROJECT>@
+</PROJECT>
diff --git a/expat/bcb5/expatw.mak b/expat/bcb5/expatw.mak
index ed54375a..cceee9ce 100644
--- a/expat/bcb5/expatw.mak
+++ b/expat/bcb5/expatw.mak
@@ -13,7 +13,7 @@ BCB = $(MAKEDIR)\..
 
 VERSION = BCB.05.03
 # ---------------------------------------------------------------------------
-PROJECT = debug\expatw.dll
+PROJECT = debug\libexpatw.dll
 OBJFILES = debug\obj\xmltok.obj debug\obj\xmlrole.obj debug\obj\xmlparse.obj
 RESFILES = 
 MAINSOURCE = expatw.bpf
diff --git a/expat/bcb5/gennmtab.bpr b/expat/bcb5/gennmtab.bpr
index 2b977ad8..286a0515 100644
--- a/expat/bcb5/gennmtab.bpr
+++ b/expat/bcb5/gennmtab.bpr
@@ -42,7 +42,7 @@
   <LINKER>
     <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
     <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="$(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib"/>
   </LINKER>
   <IDEOPTIONS>
 [Version Info]
@@ -142,4 +142,4 @@ ActiveLang=
 ProjectLang=
 RootDir=
   </IDEOPTIONS>
-</PROJECT>@
+</PROJECT>
diff --git a/expat/bcb5/gennmtab.mak b/expat/bcb5/gennmtab.mak
index b69ea5b9..396e0eb4 100644
--- a/expat/bcb5/gennmtab.mak
+++ b/expat/bcb5/gennmtab.mak
@@ -50,7 +50,7 @@ LFLAGS = -Idebug\obj -D"" -ap -Tpe -x -Gn -v -q
 # ---------------------------------------------------------------------------
 ALLOBJ = c0x32.obj $(OBJFILES)
 ALLRES = $(RESFILES)
-ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib
+ALLLIB = $(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib
 # ---------------------------------------------------------------------------
 !ifdef IDEOPTIONS
 
diff --git a/expat/bcb5/outline.bpr b/expat/bcb5/outline.bpr
index 088bba90..6164569e 100644
--- a/expat/bcb5/outline.bpr
+++ b/expat/bcb5/outline.bpr
@@ -42,7 +42,7 @@
   <LINKER>
     <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
     <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="$(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib"/>
   </LINKER>
   <IDEOPTIONS>
 [Version Info]
@@ -141,4 +141,4 @@ ActiveLang=
 ProjectLang=
 RootDir=
   </IDEOPTIONS>
-</PROJECT>@
+</PROJECT>
diff --git a/expat/bcb5/outline.mak b/expat/bcb5/outline.mak
index 4494aaef..e30f0a5c 100644
--- a/expat/bcb5/outline.mak
+++ b/expat/bcb5/outline.mak
@@ -50,7 +50,7 @@ LFLAGS = -Idebug\obj -D"" -ap -Tpe -x -Gn -v -q
 # ---------------------------------------------------------------------------
 ALLOBJ = c0x32.obj $(OBJFILES)
 ALLRES = $(RESFILES)
-ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib
+ALLLIB = $(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib
 # ---------------------------------------------------------------------------
 !ifdef IDEOPTIONS
 
diff --git a/expat/bcb5/xmlwf.bpr b/expat/bcb5/xmlwf.bpr
index 4395b65f..dd6c4713 100644
--- a/expat/bcb5/xmlwf.bpr
+++ b/expat/bcb5/xmlwf.bpr
@@ -43,7 +43,7 @@
   <LINKER>
     <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
     <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="$(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib"/>
   </LINKER>
   <IDEOPTIONS>
 [Version Info]
@@ -141,4 +141,4 @@ ActiveLang=
 ProjectLang=
 RootDir=
   </IDEOPTIONS>
-</PROJECT>@
+</PROJECT>
diff --git a/expat/bcb5/xmlwf.mak b/expat/bcb5/xmlwf.mak
index 01de9a3f..0073a7e3 100644
--- a/expat/bcb5/xmlwf.mak
+++ b/expat/bcb5/xmlwf.mak
@@ -51,7 +51,7 @@ LFLAGS = -Idebug\obj -D"" -ap -Tpe -x -Gn -v -q
 # ---------------------------------------------------------------------------
 ALLOBJ = c0x32.obj $(OBJFILES)
 ALLRES = $(RESFILES)
-ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib
+ALLLIB = $(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib
 # ---------------------------------------------------------------------------
 !ifdef IDEOPTIONS