diff --git a/hw/pc.c b/hw/pc.c
index 77f6812..d383bdc 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -56,6 +56,10 @@
 
 #define MAX_IDE_BUS 2
 
+#ifdef HAS_TPM
+void tpm_tis_init(SetIRQFunc *set_irq, void *opaque, int irq);
+#endif
+
 static fdctrl_t *floppy_controller;
 static RTCState *rtc_state;
 static PITState *pit;
diff --git a/hw/tpm_tis.c b/hw/tpm_tis.c
index ceb0dec..50ecac0 100644
--- a/hw/tpm_tis.c
+++ b/hw/tpm_tis.c
@@ -138,7 +138,7 @@ typedef struct TPMState {
 
 
 /* local prototypes */
-static int TPM_Send(tpmState *s, tpmBuffer *buffer, uint8_t locty, char *msg);
+static int TPM_Send(tpmState *s, tpmBuffer *buffer, uint8_t locty, const char *msg);
 static int TPM_Receive(tpmState *s, tpmBuffer *buffer);
 static uint32_t vtpm_instance_from_xenstore(void);
 static void tis_poll_timer(void *opaque);
@@ -860,6 +860,9 @@ typedef struct LPCtpmState {
 /*
  * initialize TIS interface
  */
+
+void tpm_tis_init(SetIRQFunc *set_irq, void *opaque, int irq);
+
 void tpm_tis_init(SetIRQFunc *set_irq, void *opaque, int irq)
 {
     LPCtpmState *d;
@@ -952,7 +955,7 @@ const static unsigned char tpm_failure[] = {
 /*
  * Send a TPM request.
  */
-static int TPM_Send(tpmState *s, tpmBuffer *buffer, uint8_t locty, char *msg)
+static int TPM_Send(tpmState *s, tpmBuffer *buffer, uint8_t locty, const char *msg)
 {
     int len;
     uint32_t size = tpm_get_size_from_buffer(buffer->buf);
@@ -1073,7 +1076,7 @@ static uint32_t vtpm_instance_from_xenstore(void)
     unsigned int num;
     uint32_t number = VTPM_BAD_INSTANCE;
     int end = 0;
-    char *token = "tok";
+    const char *token = "tok";
     int subscribed = 0;
     int ctr = 0;
     fd_set readfds;
diff --git a/hw/xen_blktap.c b/hw/xen_blktap.c
index 0547889..24d10a3 100644
--- a/hw/xen_blktap.c
+++ b/hw/xen_blktap.c
@@ -61,8 +61,6 @@
 #endif 
 
 
-extern int domid;
-
 int read_fd;
 int write_fd;
 
diff --git a/hw/xen_blktap.h b/hw/xen_blktap.h
index 92cc08e..0835878 100644
--- a/hw/xen_blktap.h
+++ b/hw/xen_blktap.h
@@ -50,4 +50,6 @@ typedef struct fd_list_entry {
 	struct fd_list_entry **pprev, *next;
 } fd_list_entry_t;
 
+int init_blktap(void);
+
 #endif /*XEN_BLKTAP_H_*/
diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 674ffca..6e570ad 100644
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -28,18 +28,19 @@
 #include "boards.h"
 #include "xen_backend.h"
 
+#ifndef CONFIG_STUBDOM
+#include <hw/xen_blktap.h>
+#endif
+
 int xen_domid;
 enum xen_mode xen_mode = XEN_EMULATE;
 
-extern void init_blktap(void);
-
-
 /* The Xen PV machine currently provides
  *   - a virtual framebuffer
  *   - ....
  */
 static void xen_init_pv(ram_addr_t ram_size, int vga_ram_size,
-			const char *boot_device, DisplayState *ds,
+			const char *boot_device,
 			const char *kernel_filename,
 			const char *kernel_cmdline,
 			const char *initrd_filename,
@@ -47,7 +48,6 @@ static void xen_init_pv(ram_addr_t ram_size, int vga_ram_size,
 			const char *direct_pci)
 {
     struct xenfb *xenfb;
-    extern int domid;
     CPUState *env;
 
 #ifndef CONFIG_STUBDOM
diff --git a/i386-dm/exec-dm.c b/i386-dm/exec-dm.c
index d035eb5..99a32b2 100644
--- a/i386-dm/exec-dm.c
+++ b/i386-dm/exec-dm.c
@@ -712,7 +712,7 @@ void cpu_physical_memory_write_rom(target_phys_addr_t addr,
 void qemu_register_coalesced_mmio(target_phys_addr_t addr, ram_addr_t size) { }
 void qemu_unregister_coalesced_mmio(target_phys_addr_t addr, ram_addr_t size) { }
 
-#if DIRECT_MMAP
+#ifdef DIRECT_MMAP
 void *cpu_physical_memory_map(target_phys_addr_t addr,
                               target_phys_addr_t *plen,
                               int is_write) {
diff --git a/i386-dm/helper2.c b/i386-dm/helper2.c
index f22b28d..969241f 100644
--- a/i386-dm/helper2.c
+++ b/i386-dm/helper2.c
@@ -82,7 +82,6 @@ int vcpus = 1;
 int xc_handle = -1;
 
 char domain_name[64] = "Xen-no-name";
-int domid;
 
 int domid_backend = 0;
   /* 0 for now.  If we ever have non-dom0 backend domains, this
@@ -313,9 +312,6 @@ static void do_outp(CPUState *env, unsigned long addr,
     }
 }
 
-extern void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
-                                   int len, int is_write);
-
 static inline void read_physical(uint64_t addr, unsigned long size, void *val)
 {
     return cpu_physical_memory_rw((target_phys_addr_t)addr, val, size, 0);
@@ -505,7 +501,6 @@ static void handle_buffered_io(void *opaque)
 
 static void cpu_handle_ioreq(void *opaque)
 {
-    extern int vm_running;
     extern int shutdown_requested;
     CPUState *env = opaque;
     ioreq_t *req = cpu_get_ioreq();
@@ -552,7 +547,6 @@ int xen_pause_requested;
 
 int main_loop(void)
 {
-    extern int vm_running;
     CPUState *env = cpu_single_env;
     int evtchn_fd = xce_handle == -1 ? -1 : xc_evtchn_fd(xce_handle);
     char *qemu_file;
diff --git a/net.c b/net.c
index d7bf022..3b2a719 100644
--- a/net.c
+++ b/net.c
@@ -753,6 +753,8 @@ static int tap_open(char *ifname, int ifname_size)
 #ifndef TAPGIFNAME
     char *dev;
     struct stat s;
+#else
+    struct ifreq ifr;
 #endif
 
     TFR(fd = open("/dev/tap", O_RDWR));
diff --git a/sysemu.h b/sysemu.h
index 2fc4914..8185e3f 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -44,6 +44,10 @@ void do_loadvm(const char *name);
 void do_delvm(const char *name);
 void do_info_snapshots(void);
 
+#ifdef CONFIG_PASSTHROUGH
+int pci_emulation_add(char *config_text);
+#endif
+
 void qemu_announce_self(void);
 
 void main_loop_wait(int timeout);
diff --git a/tapdisk-ioemu.c b/tapdisk-ioemu.c
index 52c5ac6..5b257e7 100644
--- a/tapdisk-ioemu.c
+++ b/tapdisk-ioemu.c
@@ -8,8 +8,8 @@
 #include <sys/time.h>
 
 #include <assert.h>
+#include <hw/xen_blktap.h>
 
-extern int init_blktap(void);
 extern void qemu_aio_init(void);
 extern void qemu_aio_poll(void);
 extern void bdrv_init(void);
diff --git a/vl.c b/vl.c
index 9b9f7d5..3a130d1 100644
--- a/vl.c
+++ b/vl.c
@@ -5894,12 +5894,14 @@ int main(int argc, char **argv, char **envp)
         }
     }
 
+#ifdef CONFIG_PASSTHROUGH
     for (i = 0; i < nb_pci_emulation; i++) {
-        if(pci_emulation_add(pci_emulation_config_text[i]) < 0) {
+        if (pci_emulation_add(pci_emulation_config_text[i]) < 0) {
             fprintf(stderr, "Warning: could not add PCI device %s\n",
                     pci_emulation_config_text[i]);
         }
     }
+#endif
 
     if (strlen(direct_pci_str) > 0)
         direct_pci = direct_pci_str;
diff --git a/xen-vl-extra.c b/xen-vl-extra.c
index d47b0ab..b90708d 100644
--- a/xen-vl-extra.c
+++ b/xen-vl-extra.c
@@ -7,7 +7,7 @@
 /* There is no need for multiple-inclusion protection since
  * there is only one place where this file is included. */
 
-
+#include "sysemu.h"
 
 /* Max number of PCI emulation */
 #define MAX_PCI_EMULATION 32
@@ -133,7 +133,7 @@ void do_pci_add(char *devname)
     acpi_php_add(pci_slot);
 }
 
-static int pci_emulation_add(char *config_text)
+int pci_emulation_add(char *config_text)
 {
     PCI_EMULATION_INFO *new;
     if ((new = qemu_mallocz(sizeof(PCI_EMULATION_INFO))) == NULL) {
diff --git a/xenstore.c b/xenstore.c
index 4ee6ceb..3934f62 100644
--- a/xenstore.c
+++ b/xenstore.c
@@ -247,7 +247,7 @@ static void xenstore_get_backend_path(char **backend, const char *devtype,
     free(frontend_doublecheck);
 }
 
-const char *xenstore_get_guest_uuid(void)
+static const char *xenstore_get_guest_uuid(void)
 {
     static char *already_computed = NULL;
 
@@ -646,7 +646,7 @@ int xenstore_fd(void)
     return -1;
 }
 
-void xenstore_process_logdirty_event(void)
+static void xenstore_process_logdirty_event(void)
 {
     char *act;
     static char *active_path = NULL;
@@ -1266,7 +1266,7 @@ char *xenstore_device_model_read(int domid, char *key, unsigned int *len)
     return value;
 }
 
-char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *len)
+static char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *len)
 {
     char *path = NULL, *value = NULL;
     
@@ -1281,7 +1281,7 @@ char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *len)
     return value;
 }
 
-int xenstore_extended_power_mgmt_write(const char *key, const char *value)
+static int xenstore_extended_power_mgmt_write(const char *key, const char *value)
 {
     int ret;
     char *path = NULL;
@@ -1294,7 +1294,8 @@ int xenstore_extended_power_mgmt_write(const char *key, const char *value)
     return ret;
 }
 
-int xenstore_extended_power_mgmt_event_trigger(const char *key, const char *value)
+static int
+xenstore_extended_power_mgmt_event_trigger(const char *key, const char *value)
 {
     int ret;
     char *path = NULL;