diff --git a/qemu/include/qemu/module.h b/qemu/include/qemu/module.h
index 4161e23c..01b9fe58 100644
--- a/qemu/include/qemu/module.h
+++ b/qemu/include/qemu/module.h
@@ -16,45 +16,15 @@
 
 #include "qemu/osdep.h"
 
-#define DSO_STAMP_FUN         glue(qemu_stamp, CONFIG_STAMP)
-#define DSO_STAMP_FUN_STR     stringify(DSO_STAMP_FUN)
-
-#ifdef BUILD_DSO
-void DSO_STAMP_FUN(void);
-/* This is a dummy symbol to identify a loaded DSO as a QEMU module, so we can
- * distinguish "version mismatch" from "not a QEMU module", when the stamp
- * check fails during module loading */
-void qemu_module_dummy(void);
-
-#define module_init(function, type)                                         \
-static void __attribute__((constructor)) do_qemu_init_ ## function(void)    \
-{                                                                           \
-    register_dso_module_init(function, type);                               \
-}
-#else
-/* This should not be used directly.  Use block_init etc. instead.  */
-#define module_init(function, type)                                         \
-static void __attribute__((constructor)) do_qemu_init_ ## function(void)    \
-{                                                                           \
-    register_module_init(function, type);                                   \
-}
-#endif
-
 typedef enum {
-    MODULE_INIT_BLOCK,
     MODULE_INIT_MACHINE,
-    MODULE_INIT_QAPI,
     MODULE_INIT_QOM,
     MODULE_INIT_MAX
 } module_init_type;
 
 #define machine_init(function) module_init(function, MODULE_INIT_MACHINE)
-#define qapi_init(function) module_init(function, MODULE_INIT_QAPI)
 #define type_init(function) module_init(function, MODULE_INIT_QOM)
 
-void register_module_init(void (*fn)(void), module_init_type type);
-void register_dso_module_init(void (*fn)(void), module_init_type type);
-
 void module_call_init(struct uc_struct *uc, module_init_type type);
 
 #endif