diff --git a/Xi/opendev.c b/Xi/opendev.c
index 977a44115..a2754506e 100644
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@@ -52,9 +52,12 @@ SOFTWARE.
 
 #include <dix-config.h>
 
-#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/input_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
 #include "XIstubs.h"
 #include "windowstr.h"          /* window structure  */
 #include "exglobals.h"
diff --git a/dix/input_priv.h b/dix/input_priv.h
index c1275f020..c921c5393 100644
--- a/dix/input_priv.h
+++ b/dix/input_priv.h
@@ -455,4 +455,13 @@ Bool IsPointerDevice(DeviceIntPtr dev)
 Bool IsKeyboardDevice(DeviceIntPtr dev)
     _X_ATTRIBUTE_NONNULL_ARG(1);
 
+/*
+ * @brief check whether input device is a master
+ *
+ * @param dev   device to be checked
+ * @return TRUE if the device is a master
+ */
+Bool IsMaster(DeviceIntPtr dev)
+    _X_ATTRIBUTE_NONNULL_ARG(1);
+
 #endif /* _XSERVER_INPUT_PRIV_H */
diff --git a/include/dix.h b/include/dix.h
index 7fb034c3c..6c083172f 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -288,9 +288,6 @@ typedef struct {
     DeviceIntPtr device;
 } DeviceEventInfoRec;
 
-extern _X_EXPORT Bool
-IsMaster(DeviceIntPtr dev);
-
 extern _X_EXPORT Bool
 IsFloating(DeviceIntPtr dev);
 
diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index 749123577..49a1459bb 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -33,6 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/Xproto.h>
 #include <X11/extensions/XI.h>
 
+#include "dix/input_priv.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "misc.h"