diff --git a/extflat/EFvisit.c b/extflat/EFvisit.c
index a57356a8..43b07806 100644
--- a/extflat/EFvisit.c
+++ b/extflat/EFvisit.c
@@ -33,7 +33,8 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
 #include "utils/malloc.h"
 #include "utils/utils.h"
 #include "extflat/extflat.h"
-#include "extflat/EFint.h"
+#include "database/database.h"  /* before EFint.h for ArrayInfo */
+#include "extflat/EFint.h"      /* also has ArrayInfo */
 #include "tiles/tile.h"
 #include "extract/extract.h"
 
diff --git a/extract/extract.h b/extract/extract.h
index 60baca74..4ee74cab 100644
--- a/extract/extract.h
+++ b/extract/extract.h
@@ -23,6 +23,7 @@
 #define _EXTRACT_H
 
 #include "utils/magic.h"
+#include "database/database.h"  /* TileTypeBitMask */
 
 /* Extractor warnings */
 #define	EXTWARN_DUP	0x01	/* Warn if two nodes have the same name */