diff --git a/hw/battery_mgmt.c b/hw/battery_mgmt.c
index 3ddeb09..a53f5fc 100644
--- a/hw/battery_mgmt.c
+++ b/hw/battery_mgmt.c
@@ -60,7 +60,7 @@
 static enum POWER_MGMT_MODE power_mgmt_mode = PM_MODE_NONE;
 static battery_state_info battery_info;
 
-int is_battery_pt_feasible(void)
+static int is_battery_pt_feasible(void)
 {
     int val;
 
@@ -82,7 +82,7 @@ int is_battery_pt_feasible(void)
     return val;
 }
 
-void battery_mgmt_pt_mode_init(void)
+static void battery_mgmt_pt_mode_init(void)
 {
     int xc;
 
@@ -128,7 +128,7 @@ static void battery_dbg_port_86_input(void *opaque, uint32_t addr, uint32_t val)
 }
 #endif //BATTERY_MGMT_DEBUG_EXT
 
-void get_battery_data_from_xenstore(void)
+static void get_battery_data_from_xenstore(void)
 {
     battery_info.battery_data = 0;
     battery_info.current_index = 0;
@@ -139,7 +139,7 @@ void get_battery_data_from_xenstore(void)
         battery_info.battery_data = xenstore_read_battery_data(1/*battery status*/);
 }
 
-void write_battery_data_to_port(void)
+static void write_battery_data_to_port(void)
 {
     char temp[3];
     char *data;
@@ -239,7 +239,7 @@ static uint32_t battery_port_3_readb(void *opaque, uint32_t addr)
 }
 
 
-void battery_mgmt_non_pt_mode_init(PCIDevice *device)
+static void battery_mgmt_non_pt_mode_init(PCIDevice *device)
 {
     memset(&battery_info, 0, sizeof(battery_state_info));
     register_ioport_read(BATTERY_PORT_1, 2, 1, battery_port_1_readb, device);
diff --git a/qemu-xen.h b/qemu-xen.h
index 41fbc53..7c8e110 100644
--- a/qemu-xen.h
+++ b/qemu-xen.h
@@ -107,7 +107,7 @@ int xenstore_unsubscribe_from_hotplug_status(struct xs_handle *handle,
 
 int xenstore_vm_write(int domid, const char *key, const char *val);
 char *xenstore_vm_read(int domid, const char *key, unsigned int *len);
-char *xenstore_device_model_read(int domid, char *key, unsigned int *len);
+char *xenstore_device_model_read(int domid, const char *key, unsigned int *len);
 char *xenstore_read_battery_data(int battery_status);
 int xenstore_refresh_battery_status(void);
 int xenstore_pv_driver_build_blacklisted(uint16_t product_number,
diff --git a/xenstore.c b/xenstore.c
index 8504610..d2f38d2 100644
--- a/xenstore.c
+++ b/xenstore.c
@@ -1241,7 +1241,7 @@ int xenstore_vm_write(int domid, const char *key, const char *value)
     return rc;
 }
 
-char *xenstore_device_model_read(int domid, char *key, unsigned int *len)
+char *xenstore_device_model_read(int domid, const char *key, unsigned int *len)
 {
     char *path = NULL, *value = NULL;