diff --git a/Data/SQLite/src/Utility.cpp b/Data/SQLite/src/Utility.cpp
index 527e1cecc..a8197c04e 100644
--- a/Data/SQLite/src/Utility.cpp
+++ b/Data/SQLite/src/Utility.cpp
@@ -167,7 +167,9 @@ void Utility::throwException(int rc, const std::string& addErrMsg)
 		throw ExecutionAbortedException(std::string("Callback routine requested an abort"), addErrMsg);
 	case SQLITE_BUSY:
 	case SQLITE_BUSY_RECOVERY:
+#if defined(SQLITE_BUSY_SNAPSHOT)
 	case SQLITE_BUSY_SNAPSHOT:
+#endif
 		throw DBLockedException(std::string("The database file is locked"), addErrMsg);
 	case SQLITE_LOCKED:
 		throw TableLockedException(std::string("A table in the database is locked"), addErrMsg);
diff --git a/Makefile b/Makefile
index 3ff129ccf..41800cb80 100644
--- a/Makefile
+++ b/Makefile
@@ -234,7 +234,7 @@ Data-libexec:  Foundation-libexec
 Data-tests: Data-libexec cppunit
 	$(MAKE) -C $(POCO_BASE)/Data/testsuite
 
-Data-samples: Data-libexec  Data-libexec Data/SQLite-libexec
+Data-samples: Data-libexec  Data-libexec Data/SQLite-libexec Net-libexec
 	$(MAKE) -C $(POCO_BASE)/Data/samples
 
 Data-clean:
diff --git a/Net/samples/Mail/Makefile b/Net/samples/Mail/Makefile
index 38885ca86..4dc74e8b2 100644
--- a/Net/samples/Mail/Makefile
+++ b/Net/samples/Mail/Makefile
@@ -10,6 +10,6 @@ objects = Mail
 
 target         = Mail
 target_version = 1
-target_libs    = PocoUtil PocoNet PocoXML PocoFoundation
+target_libs    = PocoUtil PocoNet PocoXML PocoJSON PocoFoundation
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/Net/samples/dict/Makefile b/Net/samples/dict/Makefile
index 8cfdaaf70..38491ad8e 100644
--- a/Net/samples/dict/Makefile
+++ b/Net/samples/dict/Makefile
@@ -10,6 +10,6 @@ objects = dict
 
 target         = dict
 target_version = 1
-target_libs    = PocoUtil PocoNet PocoJSON PocoXML PocoFoundation
+target_libs    = PocoUtil PocoNet PocoXML PocoJSON PocoFoundation
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/Net/samples/download/Makefile b/Net/samples/download/Makefile
index a7988991f..313e7a1e5 100644
--- a/Net/samples/download/Makefile
+++ b/Net/samples/download/Makefile
@@ -10,6 +10,6 @@ objects = download
 
 target         = download
 target_version = 1
-target_libs    = PocoUtil PocoNet PocoXML PocoFoundation
+target_libs    = PocoUtil PocoNet PocoXML PocoJSON PocoFoundation
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/Net/samples/httpget/Makefile b/Net/samples/httpget/Makefile
index 23e16a586..b0857c82b 100644
--- a/Net/samples/httpget/Makefile
+++ b/Net/samples/httpget/Makefile
@@ -10,6 +10,6 @@ objects = httpget
 
 target         = httpget
 target_version = 1
-target_libs    = PocoUtil PocoNet PocoXML PocoFoundation
+target_libs    = PocoUtil PocoNet PocoXML PocoJSON PocoFoundation
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/XML/include/Poco/XML/XMLStreamParser.h b/XML/include/Poco/XML/XMLStreamParser.h
index 580a3e8f0..e10ae8a7e 100644
--- a/XML/include/Poco/XML/XMLStreamParser.h
+++ b/XML/include/Poco/XML/XMLStreamParser.h
@@ -30,7 +30,11 @@
 #include "Poco/XML/QName.h"
 #include "Poco/XML/ValueTraits.h"
 #include "Poco/XML/Content.h"
+#if defined(POCO_UNBUNDLED)
+#include <expat.h>
+#else
 #include <Poco/XML/expat.h>
+#endif
 #include <map>
 #include <vector>
 #include <string>