diff --git a/dlls/amstream/regsvr.c b/dlls/amstream/regsvr.c
index 478818f2a5d..028c68de754 100644
--- a/dlls/amstream/regsvr.c
+++ b/dlls/amstream/regsvr.c
@@ -33,6 +33,7 @@
 #include "amstream.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(amstream);
 
@@ -159,7 +160,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/avifil32/regsvr.c b/dlls/avifil32/regsvr.c
index 6ec40856368..ef642acf3d0 100644
--- a/dlls/avifil32/regsvr.c
+++ b/dlls/avifil32/regsvr.c
@@ -32,6 +32,7 @@
 #include "avifile_private.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
@@ -158,7 +159,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/browseui/regsvr.c b/dlls/browseui/regsvr.c
index 5c265f466cb..62b4ea60caa 100644
--- a/dlls/browseui/regsvr.c
+++ b/dlls/browseui/regsvr.c
@@ -33,6 +33,7 @@
 #include "browseui.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(browseui);
 
@@ -159,7 +160,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/d3dxof/regsvr.c b/dlls/d3dxof/regsvr.c
index 34c5827fc20..e50917f68dd 100644
--- a/dlls/d3dxof/regsvr.c
+++ b/dlls/d3dxof/regsvr.c
@@ -34,6 +34,7 @@
 #include "dxfile.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 
@@ -160,7 +161,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/ddraw/regsvr.c b/dlls/ddraw/regsvr.c
index d851454d0b1..6ab75d12043 100644
--- a/dlls/ddraw/regsvr.c
+++ b/dlls/ddraw/regsvr.c
@@ -31,6 +31,7 @@
 #include "ddraw.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
@@ -150,7 +151,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dinput/regsvr.c b/dlls/dinput/regsvr.c
index ac1ffc1690d..54f5be5b160 100644
--- a/dlls/dinput/regsvr.c
+++ b/dlls/dinput/regsvr.c
@@ -31,6 +31,7 @@
 #include "dinput.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
@@ -157,7 +158,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dmband/regsvr.c b/dlls/dmband/regsvr.c
index 4c4fc0fa2f9..c2c7841c57f 100644
--- a/dlls/dmband/regsvr.c
+++ b/dlls/dmband/regsvr.c
@@ -19,6 +19,7 @@
  */
 
 #include "dmband_private.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmband);
 
@@ -142,7 +143,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dmcompos/regsvr.c b/dlls/dmcompos/regsvr.c
index 2fcbf8986b2..ebb8e952030 100644
--- a/dlls/dmcompos/regsvr.c
+++ b/dlls/dmcompos/regsvr.c
@@ -19,6 +19,7 @@
  */
 
 #include "dmcompos_private.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmcompos);
 
@@ -142,7 +143,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dmime/regsvr.c b/dlls/dmime/regsvr.c
index b0212a92000..33795315724 100644
--- a/dlls/dmime/regsvr.c
+++ b/dlls/dmime/regsvr.c
@@ -19,6 +19,7 @@
  */
 
 #include "dmime_private.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmime);
 
@@ -142,7 +143,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dmloader/regsvr.c b/dlls/dmloader/regsvr.c
index cd4de3554d7..e8601bed5de 100644
--- a/dlls/dmloader/regsvr.c
+++ b/dlls/dmloader/regsvr.c
@@ -19,6 +19,7 @@
  */
 
 #include "dmloader_private.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmloader);
 
@@ -142,7 +143,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dmscript/regsvr.c b/dlls/dmscript/regsvr.c
index def675f5708..f60aea5fc5e 100644
--- a/dlls/dmscript/regsvr.c
+++ b/dlls/dmscript/regsvr.c
@@ -19,6 +19,7 @@
  */
 
 #include "dmscript_private.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmscript);
 
@@ -142,7 +143,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dmstyle/regsvr.c b/dlls/dmstyle/regsvr.c
index 95c805901de..4addbd47fe8 100644
--- a/dlls/dmstyle/regsvr.c
+++ b/dlls/dmstyle/regsvr.c
@@ -19,6 +19,7 @@
  */
 
 #include "dmstyle_private.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);
 
@@ -142,7 +143,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dmsynth/regsvr.c b/dlls/dmsynth/regsvr.c
index 322190e38e4..4e271ea07de 100644
--- a/dlls/dmsynth/regsvr.c
+++ b/dlls/dmsynth/regsvr.c
@@ -19,6 +19,7 @@
  */
 
 #include "dmsynth_private.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmsynth);
 
@@ -142,7 +143,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dmusic/regsvr.c b/dlls/dmusic/regsvr.c
index ab7774cb505..e3b5d36ff95 100644
--- a/dlls/dmusic/regsvr.c
+++ b/dlls/dmusic/regsvr.c
@@ -19,6 +19,7 @@
  */
 
 #include "dmusic_private.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
@@ -142,7 +143,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dplayx/regsvr.c b/dlls/dplayx/regsvr.c
index 6bfc81207b8..0c2857cf5f6 100644
--- a/dlls/dplayx/regsvr.c
+++ b/dlls/dplayx/regsvr.c
@@ -31,6 +31,7 @@
 #include "dplobby.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
@@ -157,7 +158,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dpnet/regsvr.c b/dlls/dpnet/regsvr.c
index 578d1ea0371..69cc52546eb 100644
--- a/dlls/dpnet/regsvr.c
+++ b/dlls/dpnet/regsvr.c
@@ -33,6 +33,7 @@
 #include "dplobby8.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dpnet);
 
@@ -159,7 +160,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dsound/regsvr.c b/dlls/dsound/regsvr.c
index 514cfc97752..49c648a9199 100644
--- a/dlls/dsound/regsvr.c
+++ b/dlls/dsound/regsvr.c
@@ -31,6 +31,7 @@
 #include "dsound.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dsound);
 
@@ -160,7 +161,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dswave/regsvr.c b/dlls/dswave/regsvr.c
index d88e4b8e76c..eab1980ea20 100644
--- a/dlls/dswave/regsvr.c
+++ b/dlls/dswave/regsvr.c
@@ -19,6 +19,7 @@
  */
 
 #include "dswave_private.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dswave);
 
@@ -142,7 +143,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/dxdiagn/regsvr.c b/dlls/dxdiagn/regsvr.c
index 949c4d2c5cd..c5ba37e1e04 100644
--- a/dlls/dxdiagn/regsvr.c
+++ b/dlls/dxdiagn/regsvr.c
@@ -30,7 +30,9 @@
 
 #include "initguid.h"
 #include "dxdiag_private.h"
+
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
 
@@ -157,7 +159,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/hhctrl.ocx/regsvr.c b/dlls/hhctrl.ocx/regsvr.c
index fc247c65694..d2fb310cd1b 100644
--- a/dlls/hhctrl.ocx/regsvr.c
+++ b/dlls/hhctrl.ocx/regsvr.c
@@ -31,6 +31,7 @@
 #include "ole2.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
 
@@ -157,7 +158,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/inetcomm/regsvr.c b/dlls/inetcomm/regsvr.c
index 8ac982e85dd..993e9ae9032 100644
--- a/dlls/inetcomm/regsvr.c
+++ b/dlls/inetcomm/regsvr.c
@@ -35,6 +35,7 @@
 #include "inetcomm_private.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
 
@@ -151,7 +152,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/inseng/regsvr.c b/dlls/inseng/regsvr.c
index 54eee1e6b40..daa6a66da9b 100644
--- a/dlls/inseng/regsvr.c
+++ b/dlls/inseng/regsvr.c
@@ -33,6 +33,7 @@
 #include "initguid.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(inseng);
 
@@ -162,7 +163,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/mlang/regsvr.c b/dlls/mlang/regsvr.c
index f5292bff704..eb6cbd4cc78 100644
--- a/dlls/mlang/regsvr.c
+++ b/dlls/mlang/regsvr.c
@@ -33,6 +33,8 @@
 #include "mlang.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
+
 #include "initguid.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mlang);
@@ -163,7 +165,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/msi/regsvr.c b/dlls/msi/regsvr.c
index 15fc1260dcf..11a296524bb 100644
--- a/dlls/msi/regsvr.c
+++ b/dlls/msi/regsvr.c
@@ -36,6 +36,7 @@
 #include "oleauto.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 #include "msi.h"
 #include "initguid.h"
@@ -179,7 +180,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c
index 320d51e280d..a6ed0ee72d2 100644
--- a/dlls/msxml3/regsvr.c
+++ b/dlls/msxml3/regsvr.c
@@ -45,6 +45,7 @@
 #include "msxml_private.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
@@ -180,7 +181,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/objsel/regsvr.c b/dlls/objsel/regsvr.c
index bfb4dd1310d..439b798fdc0 100644
--- a/dlls/objsel/regsvr.c
+++ b/dlls/objsel/regsvr.c
@@ -34,6 +34,7 @@
 #include "objsel.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 #include "initguid.h"
 
@@ -168,7 +169,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) {
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c
index 2abd63671dc..17e78eff0fe 100644
--- a/dlls/ole32/regsvr.c
+++ b/dlls/ole32/regsvr.c
@@ -38,6 +38,7 @@
 #include "moniker.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
@@ -155,7 +156,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/oleaut32/regsvr.c b/dlls/oleaut32/regsvr.c
index a9e34a1024f..9ee36b53ef0 100644
--- a/dlls/oleaut32/regsvr.c
+++ b/dlls/oleaut32/regsvr.c
@@ -34,6 +34,7 @@
 #include "typelib.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
@@ -150,7 +151,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c
index 79000bf3db7..e7785c54307 100644
--- a/dlls/quartz/regsvr.c
+++ b/dlls/quartz/regsvr.c
@@ -36,6 +36,7 @@
 #include "strmif.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
@@ -215,7 +216,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c
index 028ca0ac97a..3f899173a41 100644
--- a/dlls/shell32/regsvr.c
+++ b/dlls/shell32/regsvr.c
@@ -1,6 +1,6 @@
 /*
  *	self-registerable dll functions for shell32.dll
-*
+ *
  * Copyright (C) 2003 John K. Hohm
  *
  * This library is free software; you can redistribute it and/or
@@ -37,6 +37,7 @@
 #include "shfldr.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
@@ -191,7 +192,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c
index 2fabcc0a8da..2728cedac7a 100644
--- a/dlls/urlmon/regsvr.c
+++ b/dlls/urlmon/regsvr.c
@@ -26,6 +26,7 @@
 #include "advpub.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
@@ -152,7 +153,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
 				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
 
-	    wsprintfW(buf, fmt, list->num_methods);
+	    sprintfW(buf, fmt, list->num_methods);
 	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
 				 (CONST BYTE*)buf,
 				 (lstrlenW(buf) + 1) * sizeof(WCHAR));