diff --git a/ext2sim/Makefile b/ext2sim/Makefile
index 37d21dc5..96eac16a 100644
--- a/ext2sim/Makefile
+++ b/ext2sim/Makefile
@@ -13,7 +13,7 @@ include ${MAGICDIR}/defs.mak
 LIBS += -lm ${LD_EXTRA_LIBS} ${SUB_EXTRA_LIBS}
 CLEANS += exttosim${SHDLIB_EXT} simwrap.o finds.o ext2sim_main.o ext2sim_main finds sim2simp
 
-main: finds sim2simp # ext2sim_main # deprecated
+main: finds # sim2simp and ext2sim_main are deprecated/removed
 
 tcl-main: exttosim${SHDLIB_EXT}
 
diff --git a/ext2sim/finds.c b/ext2sim/finds.c
index f015b6ac..11bc940a 100644
--- a/ext2sim/finds.c
+++ b/ext2sim/finds.c
@@ -1,10 +1,14 @@
-#include "utils/magic.h"
-#include "utils/hash.h"
+/* System headers first: magic.h defines legacy SysV bcopy/bzero/bcmp macros
+ * (in terms of memcpy/memset/memcmp) that clash with glibc's declarations if
+ * <string.h> is pulled in afterwards, so include the C library headers before
+ * magic.h. */
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <string.h>
+#include "utils/magic.h"
+#include "utils/hash.h"
 
 char *
 token(