diff --git a/hw/hpet.c b/hw/hpet.c
index 0dc05620c0..3842a6a683 100644
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -26,13 +26,11 @@
  */
 
 #include "hw.h"
+#include "pc.h"
 #include "console.h"
 #include "qemu-timer.h"
 #include "hpet_emul.h"
 
-extern void hpet_pit_disable(void);
-extern void hpet_pit_enable(void);
-
 //#define HPET_DEBUG
 #ifdef HPET_DEBUG
 #define dprintf printf
diff --git a/hw/pc.h b/hw/pc.h
index 8433084221..a60bddf0f9 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -60,6 +60,9 @@ int pit_get_initial_count(PITState *pit, int channel);
 int pit_get_mode(PITState *pit, int channel);
 int pit_get_out(PITState *pit, int channel, int64_t current_time);
 
+void hpet_pit_disable(void);
+void hpet_pit_enable(void);
+
 /* vmport.c */
 void vmport_init(void);
 void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque);
diff --git a/monitor.c b/monitor.c
index 042d2b0bd7..68649c7bef 100644
--- a/monitor.c
+++ b/monitor.c
@@ -252,10 +252,12 @@ static void do_info_name(void)
         term_printf("%s\n", qemu_name);
 }
 
+#if defined(TARGET_I386)
 static void do_info_hpet(void)
 {
     term_printf("HPET is %s by QEMU\n", (no_hpet) ? "disabled" : "enabled");
 }
+#endif
 
 static void do_info_uuid(void)
 {