diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index a72ee40661..1893f44588 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -203,4 +203,20 @@ typedef struct {
         .moduleclass  = MOD_CLASS_VIDEODRV,     \
     };
 
+#define XF86_MODULE_DATA_INPUT(_modname, _setup, _teardown, _name, _major, _minor, _patchlevel) \
+    XF86_MODULE_VERSION_INPUT(_name, _major, _minor, _patchlevel) \
+    _X_EXPORT XF86ModuleData _modname##ModuleData = { \
+        .vers = &modVersion, \
+        .setup = _setup, \
+        .teardown = _teardown, \
+    };
+
+#define XF86_MODULE_DATA_VIDEO(_modname, _setup, _teardown, _name, _major, _minor, _patchlevel) \
+    XF86_MODULE_VERSION_VIDEO(_name, _major, _minor, _patchlevel) \
+    _X_EXPORT XF86ModuleData _modname##ModuleData = { \
+        .vers = &modVersion, \
+        .setup = _setup, \
+        .teardown = _teardown, \
+    };
+
 #endif /* _XF86MODULE_H */