diff --git a/Foundation/Makefile b/Foundation/Makefile
index e9ff26a1b..78792e0bc 100644
--- a/Foundation/Makefile
+++ b/Foundation/Makefile
@@ -76,4 +76,21 @@ ifeq ($(findstring MinGW, $(POCO_CONFIG)), MinGW)
     $(shell cd src; $(WINDMC) pocomsg.mc)
 endif
 
+# poco build system looks for sources in src/
+ifndef POCO_UNBUNDLED
+	prebuild = $(shell \
+		ln -sf $(POCO_BASE)/dependencies/zlib/src/*.c        src/ && \
+		ln -sf $(POCO_BASE)/dependencies/zlib/src/*.h        src/ && \
+		ln -sf $(POCO_BASE)/dependencies/pcre2/src/*.c       src/ && \
+		ln -sf $(POCO_BASE)/dependencies/pcre2/src/*.h       src/ && \
+		ln -sf $(POCO_BASE)/dependencies/utf8proc/src/*.c    src/ && \
+		ln -sf $(POCO_BASE)/dependencies/utf8proc/src/*.h    src/ \
+	)
+
+	INCLUDE += -I$(POCO_BASE)/dependencies/zlib/src
+	INCLUDE += -I$(POCO_BASE)/dependencies/pcre2/src
+	INCLUDE += -I$(POCO_BASE)/dependencies/utf8proc/src
+	INCLUDE += -I$(POCO_BASE)/dependencies/v8_double_conversion/src
+endif
+
 include $(POCO_BASE)/build/rules/lib
diff --git a/JSON/Makefile b/JSON/Makefile
index 7f60cc090..a013df002 100644
--- a/JSON/Makefile
+++ b/JSON/Makefile
@@ -12,6 +12,18 @@ objects = Array Object Parser ParserImpl Handler \
 	Stringifier ParseHandler PrintHandler Query \
 	JSONException Template TemplateCache pdjson
 
+# poco build system looks for sources in src/
+ifdef POCO_UNBUNDLED
+	SYSLIBS += -lpdjson
+else
+	objects += pdjson
+	prebuild = $(shell \
+		ln -sf $(POCO_BASE)/dependencies/pdjson/src/pdjson.c  src/ && \
+		ln -sf $(POCO_BASE)/dependencies/pdjson/src/pdjson.h  src/ \
+	)
+	INCLUDE += -I$(POCO_BASE)/dependencies/pdjson/src
+endif
+
 target         = PocoJSON
 target_version = $(LIBVERSION)
 target_libs    = PocoFoundation
diff --git a/Net/Makefile b/Net/Makefile
index a58d22dd9..cde1a6313 100644
--- a/Net/Makefile
+++ b/Net/Makefile
@@ -42,4 +42,13 @@ target         = PocoNet
 target_version = $(LIBVERSION)
 target_libs    = PocoFoundation
 
+# poco build system looks for sources in src/
+ifeq ($(findstring MinGW, $(POCO_CONFIG)), MinGW)
+prebuild = $(shell \
+	ln -sf $(POCO_BASE)/dependencies/wepoll/wepoll.c  src/wepoll.c \
+)
+INCLUDE += -I$(POCO_BASE)/dependencies/wepoll
+objects += wepoll
+endif
+
 include $(POCO_BASE)/build/rules/lib
diff --git a/PDF/Makefile b/PDF/Makefile
index 773a6767b..b8d8cf4e5 100644
--- a/PDF/Makefile
+++ b/PDF/Makefile
@@ -31,4 +31,21 @@ target         = PocoPDF
 target_version = $(LIBVERSION)
 target_libs    = PocoXML PocoJSON PocoUtil PocoFoundation
 
+# poco build system looks for sources in src/
+ifndef POCO_UNBUNDLED
+	prebuild = $(shell \
+		ln -sf $(POCO_BASE)/dependencies/zlib/src/*.c      src/ && \
+		ln -sf $(POCO_BASE)/dependencies/zlib/src/*.h      src/ && \
+		ln -sf $(POCO_BASE)/dependencies/png/src/*.c       src/ && \
+		ln -sf $(POCO_BASE)/dependencies/png/src/*.h       src/ && \
+		ln -sf $(POCO_BASE)/dependencies/hpdf/src/*.c      src/ && \
+		ln -sf $(POCO_BASE)/dependencies/hpdf/src/*.h      src/ \
+	)
+
+	INCLUDE += -I$(POCO_BASE)/dependencies/zlib/src
+	INCLUDE += -I$(POCO_BASE)/dependencies/png/src
+	INCLUDE += -I$(POCO_BASE)/dependencies/hpdf/src
+	INCLUDE += -I$(POCO_BASE)/PDF/src
+endif
+
 include $(POCO_BASE)/build/rules/lib
diff --git a/XML/Makefile b/XML/Makefile
index ea328d918..9be7f48ce 100644
--- a/XML/Makefile
+++ b/XML/Makefile
@@ -22,14 +22,23 @@ objects = AbstractContainerNode AbstractNode Attr AttrMap Attributes \
 	TreeWalker WhitespaceFilter XMLException XMLFilter XMLFilterImpl XMLReader \
 	XMLString XMLWriter XMLStreamParser XMLStreamParserException ValueTraits
 
-expat_objects = xmlparse xmlrole xmltok
+expat_objects = xmlparse xmlrole xmltok xmltok_impl xmltok_ns
 
+# poco build system looks for sources in src/
 ifdef POCO_UNBUNDLED
 	SYSLIBS += -lexpat
 else
 	objects += $(expat_objects)
+	prebuild = $(shell \
+		ln -sf $(POCO_BASE)/dependencies/expat/src/*.c     src/ && \
+		ln -sf $(POCO_BASE)/dependencies/expat/src/*.cpp.  src/ && \
+		ln -sf $(POCO_BASE)/dependencies/expat/src/*.h     src/ \
+	)
+	INCLUDE += -I$(POCO_BASE)/dependencies/expat/src
 endif
 
+INCLUDE += -I$(POCO_BASE)/XML/src
+
 target         = PocoXML
 target_version = $(LIBVERSION)
 target_libs    = PocoFoundation