diff --git a/Xi/extinit.c b/Xi/extinit.c
index aac06bef5d..7fe314ffc0 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -61,6 +61,7 @@ SOFTWARE.
 #include <X11/extensions/geproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/input_priv.h"
 #include "dix/exevents_priv.h"
 #include "dix/extension_priv.h"
 #include "miext/extinit_priv.h"
diff --git a/dix/input_priv.h b/dix/input_priv.h
index 63bdeb0c43..7ddfb182d2 100644
--- a/dix/input_priv.h
+++ b/dix/input_priv.h
@@ -328,4 +328,6 @@ int InputThreadRegisterDev(int fd,
 
 int InputThreadUnregisterDev(int fd);
 
+void AssignTypeAndName(DeviceIntPtr dev, Atom type, const char *name);
+
 #endif /* _XSERVER_INPUT_PRIV_H */
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index 8f8e334b2b..4f73a3b19c 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -33,6 +33,7 @@ from The Open Group.
 #include <X11/Xos.h>
 #include <X11/keysym.h>
 
+#include "dix/input_priv.h"
 #include "mi/mi_priv.h"
 
 #include "scrnintstr.h"
diff --git a/include/inputstr.h b/include/inputstr.h
index c0532ee1c5..2eff0472d8 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -56,10 +56,6 @@ SOFTWARE.
 #include "cursorstr.h"
 #include "privates.h"
 
-extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev,
-                                        Atom type,
-                                        const char *name);
-
 #define BitIsOn(ptr, bit) (!!(((const BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))
 #define SetBit(ptr, bit)  (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))
 #define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))