diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index dd617d99c..e67ad0f8d 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -2026,18 +2026,12 @@ static uint32_t wrap_time_in_millis(void)
     return GetTimeInMillis();
 }
 
-static void verrorf(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0);
-static void verrorf(const char *f, va_list args)
-{
-    LogVMessageVerb(X_NONE, -1, f, args);
-}
-
 static const xfont2_client_funcs_rec xfont2_client_funcs = {
     .version = XFONT2_CLIENT_FUNCS_VERSION,
     .client_auth_generation = _client_auth_generation,
     .client_signal = ClientSignal,
     .delete_font_client_id = delete_font_client_id,
-    .verrorf = verrorf,
+    .verrorf = VErrorF,
     .find_old_font = find_old_font,
     .get_client_resolutions = get_client_resolutions,
     .get_default_point_size = get_default_point_size,
diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
index 5a3a5484f..1dc695d2c 100644
--- a/hw/xfree86/int10/xf86x86emu.c
+++ b/hw/xfree86/int10/xf86x86emu.c
@@ -85,6 +85,6 @@ printk(const char *fmt, ...)
     va_list argptr;
 
     va_start(argptr, fmt);
-    LogVMessageVerb(X_NONE, -1, fmt, argptr);
+    VErrorF(fmt, argptr);
     va_end(argptr);
 }
diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
index 93e3e6706..39399b7bc 100644
--- a/hw/xfree86/parser/configProcs.h
+++ b/hw/xfree86/parser/configProcs.h
@@ -145,4 +145,6 @@ xf86freeExtensions(XF86ConfExtensionsPtr ptr);
 /* Externally provided functions */
 void
 ErrorF(const char *f, ...);
+void
+VErrorF(const char *f, va_list args);
 #endif
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index 3655eb777..bf5a8d13b 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -974,7 +974,7 @@ xf86parseError(const char *format, ...)
     ErrorF("Parse error on line %d of section %s in file %s\n\t",
            configLineNo, configSection, filename);
     va_start(ap, format);
-    LogVMessageVerb(X_NONE, -1, format, ap);
+    VErrorF(format, ap);
     va_end(ap);
 
     ErrorF("\n");
@@ -989,7 +989,7 @@ xf86validationError(const char *format, ...)
 
     ErrorF("Data incomplete in file %s\n\t", filename);
     va_start(ap, format);
-    LogVMessageVerb(X_NONE, -1, format, ap);
+    VErrorF(format, ap);
     va_end(ap);
 
     ErrorF("\n");
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 7c8d802d0..ac7fa35a3 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -90,7 +90,7 @@ xwl_give_up(const char *f, ...)
     va_list args;
 
     va_start(args, f);
-    LogVMessageVerb(X_NONE, -1, f, args);
+    VErrorF(f, args);
     va_end(args);
 
     CloseWellKnownConnections();
diff --git a/include/os.h b/include/os.h
index 3f2bdfbc0..04f47db52 100644
--- a/include/os.h
+++ b/include/os.h
@@ -349,6 +349,9 @@ _X_ATTRIBUTE_PRINTF(1, 2)
 #define DebugF(...)             /* */
 #endif
 
+extern _X_EXPORT void
+VErrorF(const char *f, va_list args)
+_X_ATTRIBUTE_PRINTF(1, 0);
 extern _X_EXPORT void
 ErrorF(const char *f, ...)
 _X_ATTRIBUTE_PRINTF(1, 2);
@@ -369,7 +372,6 @@ typedef _sigset_t sigset_t;
 #define LogMessageVerbSigSafe(...) LogMessageVerb(__VA_ARGS__)
 #define ErrorFSigSafe(...) ErrorF(__VA_ARGS__)
 #define VErrorFSigSafe(...) VErrorF(__VA_ARGS__)
-#define VErrorF(...) LogVMessageVerb(X_NONE, -1, __VA_ARGS__)
 
 /* only for backwards compat with drivers that haven't kept up yet
    (xf86-video-intel)
diff --git a/os/log.c b/os/log.c
index a7ea22a17..045c5aafd 100644
--- a/os/log.c
+++ b/os/log.c
@@ -873,7 +873,7 @@ FatalError(const char *f, ...)
         va_end(apple_args);
     }
 #endif
-    LogVMessageVerb(X_NONE, -1, f, args);
+    VErrorF(f, args);
     va_end(args);
     ErrorF("\n");
     if (!beenhere)
@@ -887,13 +887,19 @@ FatalError(const char *f, ...)
         OsAbort();
  /*NOTREACHED*/}
 
+void
+VErrorF(const char *f, va_list args)
+{
+    LogVMessageVerb(X_NONE, -1, f, args);
+}
+
 void
 ErrorF(const char *f, ...)
 {
     va_list args;
 
     va_start(args, f);
-    LogVMessageVerb(X_NONE, -1, f, args);
+    VErrorF(f, args);
     va_end(args);
 }