diff --git a/xc_malloc.c b/xc_malloc.c
index 8c165ff..e9ad870 100644
--- a/xc_malloc.c
+++ b/xc_malloc.c
@@ -86,8 +86,6 @@ XC_MEM_BLOCK_OFFSET(xc_malloc_block_offset) /* {{{ */
 
 static XC_MEM_INIT(xc_mem_malloc_init) /* {{{ */
 {
-	xc_block_t *b;
-
 #define MINSIZE (ALIGN(sizeof(xc_mem_t)))
 	/* requires at least the header and 1 tail block */
 	if (size < MINSIZE) {
diff --git a/xc_shm.c b/xc_shm.c
index 486f09a..733e7a9 100644
--- a/xc_shm.c
+++ b/xc_shm.c
@@ -18,15 +18,13 @@ static xc_shm_scheme_t xc_shm_schemes[10];
 
 void xc_shm_init_modules() /* {{{ */
 {
-	memset(xc_shm_schemes, 0, sizeof(xc_shm_schemes));
-
 	extern void xc_shm_mem_init();
-	xc_shm_mem_init();
-
 	extern void xc_shm_malloc_register();
-	xc_shm_malloc_register();
-
 	extern void xc_shm_mmap_register();
+
+	memset(xc_shm_schemes, 0, sizeof(xc_shm_schemes));
+	xc_shm_mem_init();
+	xc_shm_malloc_register();
 	xc_shm_mmap_register();
 }
 /* }}} */