2 files changed, 2 insertions, 4 deletions
diff --git a/disasm/disasm.c b/disasm/disasm.c
index fd3eb42a..7928827a 100644
--- a/disasm/disasm.c
+++ b/disasm/disasm.c
@@ -38,7 +38,6 @@
 #include "compiler.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <limits.h>
 
 #include "nasm.h"
diff --git a/disasm/ndisasm.c b/disasm/ndisasm.c
index 2d0cf153..4497c388 100644
--- a/disasm/ndisasm.c
+++ b/disasm/ndisasm.c
@@ -40,7 +40,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <errno.h>
 
@@ -69,7 +68,7 @@ static const char *help =
 static void output_ins(uint64_t, uint8_t *, int, char *);
 static void skip(uint32_t dist, FILE * fp);
 
-static void ndisasm_verror(int severity, const char *fmt, va_list va)
+static void ndisasm_verror(errflags severity, const char *fmt, va_list va)
 {
     vfprintf(stderr, fmt, va);
 
@@ -94,7 +93,7 @@ int main(int argc, char **argv)
     int64_t offset;
     FILE *fp;
 
-    tolower_init();
+    nasm_ctype_init();
     nasm_set_verror(ndisasm_verror);
     iflag_clear_all(&prefer);