diff --git a/Makefile b/Makefile
index a75ff69ba615c76609f21bd866123139332935f8..53acbebf554869a35abcca61df9cc367ce34d372 100644
--- a/Makefile
+++ b/Makefile
@@ -274,7 +274,7 @@ WIMPLIB = tbox:o.wimplib
RENDERLIB = tbox:o.renderlib
INETLIB = TCPIPLibs:o.inetlib
SOCKLIB = TCPIPLibs:o.socklib
-UNICODELIB = C:Unicode.o.ucodelib
+UNICODELIB = C:Unicode.o.ucode
NSPRLIB = C:NSPRLib.o.NSPRLib
JSLIB = C:JSLib.o.JSLib
DEBUGLIB = <Lib$Dir>.Debuglib.o.debuglib
diff --git a/Resources/UK/Browse/!Run,feb b/Resources/UK/Browse/!Run,feb
index 3c268d9716e81b8bb0387e7ea11d8c0859f81d4c..939c67c4ac49e46d9389e16d25747664bb7439c1 100644
--- a/Resources/UK/Browse/!Run,feb
+++ b/Resources/UK/Browse/!Run,feb
@@ -71,7 +71,7 @@ RMEnsure TextGadgets 0.28 Error Browse requires version 0.28 or later of the
RMEnsure URL_Fetcher 0.41 RMLoad System:Modules.Network.URL.URL
RMEnsure URL_Fetcher 0.41 Error Browse requires version 0.41 or later of the URL module
-RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.HTTP
+RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.AcornHTTP
RMEnsure AcornHTTP 0.84 Error Browse requires version 0.84 or later of the HTTP module
RMEnsure FileFetcher 0.38 RMLoad System:Modules.Network.URL.File
RMEnsure FileFetcher 0.38 Error Browse requires version 0.38 or later of the File module
diff --git a/Resources/UK/Browse/!RunD,feb b/Resources/UK/Browse/!RunD,feb
index eb834223bd38646c76825e09b5eed20396748d3e..99292d62359108cc5745124e876929243e14edd5 100644
--- a/Resources/UK/Browse/!RunD,feb
+++ b/Resources/UK/Browse/!RunD,feb
@@ -78,7 +78,7 @@ RMEnsure TextGadgets 0.28 Error Browse requires version 0.28 or later of the
RMEnsure URL_Fetcher 0.41 RMLoad System:Modules.Network.URL.URL
RMEnsure URL_Fetcher 0.41 Error Browse requires version 0.41 or later of the URL module
-RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.HTTP
+RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.AcornHTTP
RMEnsure AcornHTTP 0.84 Error Browse requires version 0.84 or later of the HTTP module
RMEnsure FileFetcher 0.38 RMLoad System:Modules.Network.URL.File
RMEnsure FileFetcher 0.38 Error Browse requires version 0.38 or later of the File module
diff --git a/Resources/UK/Browse/!RunJ,feb b/Resources/UK/Browse/!RunJ,feb
index edba16dd1d5465e688582a9d1a36a283ad125ed5..c0b1930d9c024720423f33896367e28f4a035e36 100644
--- a/Resources/UK/Browse/!RunJ,feb
+++ b/Resources/UK/Browse/!RunJ,feb
@@ -60,7 +60,7 @@ RMEnsure WindowManager 3.98 Error Browse requires version 3.98 or later of the
| Fetchers
<Browse$Dir>.RMTry -app Browse -name URL_Fetcher -version 0.41 -path System:Modules.Network.URL.URL
-<Browse$Dir>.RMTry -app Browse -name AcornHTTP -version 0.84 -path System:Modules.Network.URL.HTTP
+<Browse$Dir>.RMTry -app Browse -name AcornHTTP -version 0.84 -path System:Modules.Network.URL.AcornHTTP
<Browse$Dir>.RMTry -app Browse -name FileFetcher -version 0.38 -path System:Modules.Network.URL.File
<Browse$Dir>.RMTry -app Browse -name FTPFetcher -version 0.32 -path System:Modules.Network.URL.FTP
diff --git a/Resources/UK/Phoenix/!Run,feb b/Resources/UK/Phoenix/!Run,feb
index fb64a4b5a798b8308707cbeba7b403867517222e..c1751bb9bb89c597af33a0e8879e5b0dafd55566 100644
--- a/Resources/UK/Phoenix/!Run,feb
+++ b/Resources/UK/Phoenix/!Run,feb
@@ -71,7 +71,7 @@ RMEnsure TextGadgets 0.28 Error Phoenix requires version 0.28 or later of the
RMEnsure URL_Fetcher 0.41 RMLoad System:Modules.Network.URL.URL
RMEnsure URL_Fetcher 0.41 Error Phoenix requires version 0.41 or later of the URL module
-RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.HTTP
+RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.AcornHTTP
RMEnsure AcornHTTP 0.84 Error Phoenix requires version 0.84 or later of the HTTP module
RMEnsure FileFetcher 0.38 RMLoad System:Modules.Network.URL.File
RMEnsure FileFetcher 0.38 Error Phoenix requires version 0.38 or later of the File module
diff --git a/Resources/UK/Phoenix/!RunD,feb b/Resources/UK/Phoenix/!RunD,feb
index 9411e6ab7eb3097d0b0dc4c1c93d72cfb241a253..54b4eed6e8d4c1bb2c9e574f4e82317a730f6ab1 100644
--- a/Resources/UK/Phoenix/!RunD,feb
+++ b/Resources/UK/Phoenix/!RunD,feb
@@ -78,7 +78,7 @@ RMEnsure TextGadgets 0.28 Error Phoenix requires version 0.28 or later of the
RMEnsure URL_Fetcher 0.41 RMLoad System:Modules.Network.URL.URL
RMEnsure URL_Fetcher 0.41 Error Phoenix requires version 0.41 or later of the URL module
-RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.HTTP
+RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.AcornHTTP
RMEnsure AcornHTTP 0.84 Error Phoenix requires version 0.84 or later of the HTTP module
RMEnsure FileFetcher 0.38 RMLoad System:Modules.Network.URL.File
RMEnsure FileFetcher 0.38 Error Phoenix requires version 0.38 or later of the File module
diff --git a/Resources/UK/Phoenix/!RunJ,feb b/Resources/UK/Phoenix/!RunJ,feb
index ad1bd21f7e711055bd1867dc7eaeb5cb705c99b4..923b0f62df0fc0dd4495fd526162b1b5526659d6 100644
--- a/Resources/UK/Phoenix/!RunJ,feb
+++ b/Resources/UK/Phoenix/!RunJ,feb
@@ -60,7 +60,7 @@ RMEnsure WindowManager 3.98 Error Phoenix requires version 3.98 or later of the
| Fetchers
<Phoenix$Dir>.RMTry -app Phoenix -name URL_Fetcher -version 0.41 -path System:Modules.Network.URL.URL
-<Phoenix$Dir>.RMTry -app Phoenix -name AcornHTTP -version 0.84 -path System:Modules.Network.URL.HTTP
+<Phoenix$Dir>.RMTry -app Phoenix -name AcornHTTP -version 0.84 -path System:Modules.Network.URL.AcornHTTP
<Phoenix$Dir>.RMTry -app Phoenix -name FileFetcher -version 0.38 -path System:Modules.Network.URL.File
<Phoenix$Dir>.RMTry -app Phoenix -name FTPFetcher -version 0.32 -path System:Modules.Network.URL.FTP
diff --git a/Resources/UK/Ursula/!Run,feb b/Resources/UK/Ursula/!Run,feb
index 3c268d9716e81b8bb0387e7ea11d8c0859f81d4c..939c67c4ac49e46d9389e16d25747664bb7439c1 100644
--- a/Resources/UK/Ursula/!Run,feb
+++ b/Resources/UK/Ursula/!Run,feb
@@ -71,7 +71,7 @@ RMEnsure TextGadgets 0.28 Error Browse requires version 0.28 or later of the
RMEnsure URL_Fetcher 0.41 RMLoad System:Modules.Network.URL.URL
RMEnsure URL_Fetcher 0.41 Error Browse requires version 0.41 or later of the URL module
-RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.HTTP
+RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.AcornHTTP
RMEnsure AcornHTTP 0.84 Error Browse requires version 0.84 or later of the HTTP module
RMEnsure FileFetcher 0.38 RMLoad System:Modules.Network.URL.File
RMEnsure FileFetcher 0.38 Error Browse requires version 0.38 or later of the File module
diff --git a/Resources/UK/Ursula/!RunD,feb b/Resources/UK/Ursula/!RunD,feb
index eb834223bd38646c76825e09b5eed20396748d3e..99292d62359108cc5745124e876929243e14edd5 100644
--- a/Resources/UK/Ursula/!RunD,feb
+++ b/Resources/UK/Ursula/!RunD,feb
@@ -78,7 +78,7 @@ RMEnsure TextGadgets 0.28 Error Browse requires version 0.28 or later of the
RMEnsure URL_Fetcher 0.41 RMLoad System:Modules.Network.URL.URL
RMEnsure URL_Fetcher 0.41 Error Browse requires version 0.41 or later of the URL module
-RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.HTTP
+RMEnsure AcornHTTP 0.84 RMLoad System:Modules.Network.URL.AcornHTTP
RMEnsure AcornHTTP 0.84 Error Browse requires version 0.84 or later of the HTTP module
RMEnsure FileFetcher 0.38 RMLoad System:Modules.Network.URL.File
RMEnsure FileFetcher 0.38 Error Browse requires version 0.38 or later of the File module
diff --git a/Resources/UK/Ursula/!RunJ,feb b/Resources/UK/Ursula/!RunJ,feb
index edba16dd1d5465e688582a9d1a36a283ad125ed5..c0b1930d9c024720423f33896367e28f4a035e36 100644
--- a/Resources/UK/Ursula/!RunJ,feb
+++ b/Resources/UK/Ursula/!RunJ,feb
@@ -60,7 +60,7 @@ RMEnsure WindowManager 3.98 Error Browse requires version 3.98 or later of the
| Fetchers
<Browse$Dir>.RMTry -app Browse -name URL_Fetcher -version 0.41 -path System:Modules.Network.URL.URL
-<Browse$Dir>.RMTry -app Browse -name AcornHTTP -version 0.84 -path System:Modules.Network.URL.HTTP
+<Browse$Dir>.RMTry -app Browse -name AcornHTTP -version 0.84 -path System:Modules.Network.URL.AcornHTTP
<Browse$Dir>.RMTry -app Browse -name FileFetcher -version 0.38 -path System:Modules.Network.URL.File
<Browse$Dir>.RMTry -app Browse -name FTPFetcher -version 0.32 -path System:Modules.Network.URL.FTP
diff --git a/VersionNum b/VersionNum
index 373f75e60605de07f0558990914c4d344d8fdc1e..ba33f5927f0a791debcb29de0c8badd34650b555 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,21 @@
-/* (2.16)
+/* (2.17)
*
* This file is automatically maintained by srccommit, do not edit manually.
- * Last processed by srccommit version: 1.1.
*
*/
-#define Module_MajorVersion_CMHG 2.16
+#define Module_MajorVersion_CMHG 2.17
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 13 Dec 2014
+#define Module_Date_CMHG 11 Jan 2020
-#define Module_MajorVersion "2.16"
-#define Module_Version 216
+#define Module_MajorVersion "2.17"
+#define Module_Version 217
#define Module_MinorVersion ""
-#define Module_Date "13 Dec 2014"
+#define Module_Date "11 Jan 2020"
-#define Module_ApplicationDate "13-Dec-14"
+#define Module_ApplicationDate "11-Jan-20"
#define Module_ComponentName "Browse"
-#define Module_ComponentPath "castle/RiscOS/Sources/Apps/Browse"
-#define Module_FullVersion "2.16"
-#define Module_HelpVersion "2.16 (13 Dec 2014)"
-#define Module_LibraryVersionInfo "2:16"
+#define Module_FullVersion "2.17"
+#define Module_HelpVersion "2.17 (11 Jan 2020)"
+#define Module_LibraryVersionInfo "2:17"
diff --git a/c/FetchPage b/c/FetchPage
index 6eba2f6a04ee1af705068481db4036dcf2b7521b..ded24be51640baa5aa1f3fc3077d31e16fa63e4b 100644
--- a/c/FetchPage
+++ b/c/FetchPage
@@ -36,7 +36,7 @@
#include <kernel.h>
#include <swis.h>
-#include <URI.h>
+#include "Interface/URI.h"
#include <tboxlibs/wimp.h>
#include <tboxlibs/wimplib.h>
diff --git a/c/Main b/c/Main
index e80e109e7bb79b8e1d429b25b7b1650a64814760..a8fcb76af1171906caacf270b7485efaa8100ad9 100644
--- a/c/Main
+++ b/c/Main
@@ -40,7 +40,7 @@
#include <tboxlibs/flex.h>
#include <HTMLLib/HTMLLib.h>
-#include <URI.h>
+#include "Interface/URI.h"
#include <tboxlibs/wimp.h>
#include <tboxlibs/wimplib.h>
diff --git a/c/Protocols b/c/Protocols
index 08a47851870c5a1a3d35e51550c5f7c0226ba30b..1ea3a8722f3afe8b2805aec743bd561eaf1c9fc3 100644
--- a/c/Protocols
+++ b/c/Protocols
@@ -65,7 +65,7 @@
#include <kernel.h>
#include <swis.h>
-#include <URI.h>
+#include "Interface/URI.h"
#include <tboxlibs/wimp.h>
#include <tboxlibs/wimplib.h>
diff --git a/c/URLutils b/c/URLutils
index 6f8fd08d27efbd83420109a782a29d9d635efb95..6f3ebb3989390a9881a972fdde80036df58f7dac 100644
--- a/c/URLutils
+++ b/c/URLutils
@@ -32,7 +32,7 @@
#include <kernel.h>
#include <swis.h>
-#include <URI.h>
+#include "Interface/URI.h"
#include <tboxlibs/wimp.h>
#include <tboxlibs/event.h>
diff --git a/h/URLutils b/h/URLutils
index d5f7accc251e96f54d8e68defcab1d35b05d33b2..41a775a205bb35356760a5fabbcc16bf7d129c96 100644
--- a/h/URLutils
+++ b/h/URLutils
@@ -29,7 +29,7 @@
#define Browser_URLutils__
#include <kernel.h>
- #include <URI.h> /* URI handler API, in C:h.URI, exported by the URI module */
+ #include "Interface/URI.h" /* URI handler API, in C:h.URI, exported by the URI module */
#include "Global.h"