diff --git a/tools/amalgamate.bat b/tools/amalgamate.bat
index cd40ecd..2ed5fd0 100644
--- a/tools/amalgamate.bat
+++ b/tools/amalgamate.bat
@@ -10,3 +10,6 @@ cd %p%..
 REM Amalgamate
 python tools/amalgamate/amalgamate.py -c tools/amalgamate/config-cpp.json -s . -p tools/amalgamate/config-cpp.prologue --no-duplicates
 python tools/amalgamate/amalgamate.py -c tools/amalgamate/config-h.json -s .
+
+REM Copy url_for_*.h files
+copy /y include\upa\url_for_*.h single_include\upa
diff --git a/tools/amalgamate.sh b/tools/amalgamate.sh
index cd70279..446f337 100755
--- a/tools/amalgamate.sh
+++ b/tools/amalgamate.sh
@@ -10,3 +10,6 @@ cd $p/..
 # Amalgamate
 python3 tools/amalgamate/amalgamate.py -c tools/amalgamate/config-cpp.json -s . -p tools/amalgamate/config-cpp.prologue --no-duplicates
 python3 tools/amalgamate/amalgamate.py -c tools/amalgamate/config-h.json -s .
+
+# Copy url_for_*.h files
+cp -p include/upa/url_for_*.h single_include/upa