diff --git a/Xi/chaccess.c b/Xi/chaccess.c
index f09920600..2a0e5fa75 100644
--- a/Xi/chaccess.c
+++ b/Xi/chaccess.c
@@ -110,7 +110,7 @@ ProcXChangeWindowAccess(ClientPtr client)
             (DeviceIntPtr*)xalloc(stuff->npermit * sizeof(DeviceIntPtr));
         if (!perm_devices)
         {
-            ErrorF("ProcXChangeWindowAccess: alloc failure.\n");
+            ErrorF("[Xi] ProcXChangeWindowAccess: alloc failure.\n");
             SendErrorToClient(client, IReqCode, X_ChangeWindowAccess, 0, 
                     BadImplementation);
             return Success;
@@ -136,7 +136,7 @@ ProcXChangeWindowAccess(ClientPtr client)
             (DeviceIntPtr*)xalloc(stuff->ndeny * sizeof(DeviceIntPtr));
         if (!deny_devices)
         {
-            ErrorF("ProcXChangeWindowAccecss: alloc failure.\n");
+            ErrorF("[Xi] ProcXChangeWindowAccecss: alloc failure.\n");
             SendErrorToClient(client, IReqCode, X_ChangeWindowAccess, 0, 
                     BadImplementation);
 
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 1d23809dc..c1b6eedae 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -891,7 +891,7 @@ FixExtensionEvents(ExtensionEntry * extEntry)
     {
         /* This should never happen, but if it does, hide under the
          * bed and cry for help. */
-        ErrorF("DeviceButtonMotionMask != ButtonMotionMask. Trouble!\n");
+        ErrorF("[Xi] DeviceButtonMotionMask != ButtonMotionMask. Trouble!\n");
     }
 
     DeviceFocusChangeMask = GetNextExtEventMask();
diff --git a/Xi/qryacces.c b/Xi/qryacces.c
index b59696939..95f2dd0e6 100644
--- a/Xi/qryacces.c
+++ b/Xi/qryacces.c
@@ -99,7 +99,7 @@ ProcXQueryWindowAccess(ClientPtr client)
         deviceids = (XID*)xalloc((nperm + ndeny) * sizeof(XID));
         if (!deviceids)
         {
-            ErrorF("ProcXQueryWindowAccess: xalloc failure.\n");
+            ErrorF("[Xi] ProcXQueryWindowAccess: xalloc failure.\n");
             SendErrorToClient(client, IReqCode, X_QueryWindowAccess, 
                     0, BadImplementation); 
             return Success;