diff --git a/qemu/hw/sparc/sun4m.c b/qemu/hw/sparc/sun4m.c
index 3e9ac2b7..55578323 100644
--- a/qemu/hw/sparc/sun4m.c
+++ b/qemu/hw/sparc/sun4m.c
@@ -175,18 +175,6 @@ static void nvram_init(M48t59State *nvram, uint8_t *macaddr,
 
 static DeviceState *slavio_intctl;
 
-void sun4m_pic_info(Monitor *mon, const QDict *qdict)
-{
-    if (slavio_intctl)
-        slavio_pic_info(mon, slavio_intctl);
-}
-
-void sun4m_irq_info(Monitor *mon, const QDict *qdict)
-{
-    if (slavio_intctl)
-        slavio_irq_info(mon, slavio_intctl);
-}
-
 void cpu_check_irqs(CPUSPARCState *env)
 {
     CPUState *cs;
diff --git a/qemu/include/hw/qdev-core.h b/qemu/include/hw/qdev-core.h
index 780cbb90..f10312e3 100644
--- a/qemu/include/hw/qdev-core.h
+++ b/qemu/include/hw/qdev-core.h
@@ -169,7 +169,6 @@ struct BusClass {
     ObjectClass parent_class;
 
     /* FIXME first arg should be BusState */
-    void (*print_dev)(Monitor *mon, DeviceState *dev, int indent);
     char *(*get_dev_path)(DeviceState *dev);
     /*
      * This callback is used to create Open Firmware device path in accordance
diff --git a/qemu/include/hw/sparc/sun4m.h b/qemu/include/hw/sparc/sun4m.h
index a587700a..eb76d541 100644
--- a/qemu/include/hw/sparc/sun4m.h
+++ b/qemu/include/hw/sparc/sun4m.h
@@ -24,15 +24,4 @@ static inline void sparc_iommu_memory_write(void *opaque,
     sparc_iommu_memory_rw(opaque, addr, buf, len, 1);
 }
 
-/* slavio_intctl.c */
-void slavio_pic_info(Monitor *mon, DeviceState *dev);
-void slavio_irq_info(Monitor *mon, DeviceState *dev);
-
-/* sun4m.c */
-void sun4m_pic_info(Monitor *mon, const QDict *qdict);
-void sun4m_irq_info(Monitor *mon, const QDict *qdict);
-
-/* sparc32_dma.c */
-#include "hw/sparc/sparc32_dma.h"
-
 #endif
diff --git a/qemu/include/qemu/typedefs.h b/qemu/include/qemu/typedefs.h
index 34751778..d9759fc0 100644
--- a/qemu/include/qemu/typedefs.h
+++ b/qemu/include/qemu/typedefs.h
@@ -12,8 +12,6 @@ typedef struct AioContext AioContext;
 
 typedef struct Visitor Visitor;
 
-struct Monitor;
-typedef struct Monitor Monitor;
 typedef struct MigrationParams MigrationParams;
 
 typedef struct Property Property;
diff --git a/qemu/target-i386/helper.c b/qemu/target-i386/helper.c
index 5341094e..b530f9b8 100644
--- a/qemu/target-i386/helper.c
+++ b/qemu/target-i386/helper.c
@@ -1045,7 +1045,6 @@ void breakpoint_handler(CPUState *cs)
 }
 
 typedef struct MCEInjectionParams {
-    Monitor *mon;
     X86CPU *cpu;
     int bank;
     uint64_t status;