diff --git a/asm/uncompress.c b/asm/uncompress.c
index 9481c873..646b04d3 100644
--- a/asm/uncompress.c
+++ b/asm/uncompress.c
@@ -27,7 +27,7 @@ static void nasm_z_free(void *opaque, void *ptr)
     nasm_free(ptr);
 }
 
-char *uncompress_stdmac(const macros_t *sm)
+char *uncompress_stdmac(macros_t *sm)
 {
     z_stream zs;
     void *buf = nasm_malloc(sm->dsize);
diff --git a/include/macros.h b/include/macros.h
index 4e113c05..42022a6f 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -17,7 +17,7 @@ struct builtin_macros {
 };
 typedef const struct builtin_macros macros_t;
 
-char *uncompress_stdmac(const macros_t *sm);
+char *uncompress_stdmac(macros_t *sm);
 
 /* --- From standard.mac via macros.pl -> macros.c --- */
 
diff --git a/macros/macros.pl b/macros/macros.pl
index 962719ed..6e1880c0 100755
--- a/macros/macros.pl
+++ b/macros/macros.pl
@@ -116,7 +116,7 @@ sub flush_mac($$)
     printf $out "static const unsigned char %s_blob[%d] = {\n", $name, $zlen;
     print_data($out, $zblob);
 
-    printf $out "\n%sconst macros_t %s = {\n    %d, %d, %s_blob\n};\n",
+    printf $out "\n%smacros_t %s = {\n    %d, %d, %s_blob\n};\n",
 	$mac->{'static'} ? 'static ' : '',
 	$name, $dlen, $zlen, $name;