diff --git a/hw/openpic.c b/hw/openpic.c
index 7565b1def..1d9166511 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -965,7 +965,7 @@ static void openpic_map(PCIDevice *pci_dev, int region_num,
 }
 
 openpic_t *openpic_init (PCIBus *bus, SetIRQFunc *set_irq,
-                         int *pmem_index, int nb_cpus, CPUPPCState **envp)
+                         int *pmem_index, int nb_cpus, CPUState **envp)
 {
     openpic_t *opp;
     uint8_t *pci_conf;
diff --git a/vl.h b/vl.h
index 5e2d8e857..c216b68a6 100644
--- a/vl.h
+++ b/vl.h
@@ -859,11 +859,10 @@ enum {
     OPENPIC_EVT_DEBUG,   /* Inconditional debug event */
     OPENPIC_EVT_RESET,   /* Core reset event          */
 };
-struct CPUPPCState;
 void openpic_set_irq(void *opaque, int n_IRQ, int level);
 openpic_t *openpic_init (PCIBus *bus, SetIRQFunc *set_irq,
                          int *pmem_index, int nb_cpus,
-                         struct CPUPPCState **envp);
+                         struct CPUState **envp);
 
 /* heathrow_pic.c */
 typedef struct HeathrowPICS HeathrowPICS;