diff --git a/packages/CLPBN/clpbn/bp/Makefile.in b/packages/CLPBN/clpbn/bp/Makefile.in
index 7f98526c0..cd96942bb 100644
--- a/packages/CLPBN/clpbn/bp/Makefile.in
+++ b/packages/CLPBN/clpbn/bp/Makefile.in
@@ -77,7 +77,7 @@ BIF_OBJS = \
 	CptEntry.o \
     BifInterface.o \
     BifTest.o \
-    xmlParser/xmlParser.o
+    xmlParser.o
 
 SOBJS=horus.@SO@
 
@@ -85,6 +85,9 @@ SOBJS=horus.@SO@
 all: $(SOBJS) biftest
 
 # default rule
+xmlParser.o : $(srcdir)/xmlParser/xmlParser.cpp
+	$(CXX) -c $(CXXFLAGS) $< -o $@
+
 %.o : $(srcdir)/%.cpp
 	$(CXX) -c $(CXXFLAGS) $< -o $@
 
diff --git a/packages/PLStream/pl-dtoa.c b/packages/PLStream/pl-dtoa.c
index e13bf91bf..c455d8d63 100644
--- a/packages/PLStream/pl-dtoa.c
+++ b/packages/PLStream/pl-dtoa.c
@@ -30,7 +30,7 @@
 #define MALLOC PL_malloc
 #define FREE PL_free
 
-#ifdef _REENTRANT
+#if defined(_REENTRANT)||defined(__YAP_PROLOG__)
 #define Long int			/* 32-bits */
 #define MULTIPLE_THREADS