Include required system headers.

82 files changed, 253 insertions, 25 deletions

diff --git a/source/fitz/bbox-device.c b/source/fitz/bbox-device.c
index 26268712..99c46953 100644
--- a/source/fitz/bbox-device.c
+++ b/source/fitz/bbox-device.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <assert.h>
+
 #define STACK_SIZE 96
 
 typedef struct fz_bbox_device_s
diff --git a/source/fitz/bidi-std.c b/source/fitz/bidi-std.c
index b56c0a8e..6da91877 100644
--- a/source/fitz/bidi-std.c
+++ b/source/fitz/bidi-std.c
@@ -6,6 +6,8 @@
 #include "mupdf/fitz.h"
 #include "bidi-imp.h"
 
+#include <assert.h>
+
 #ifndef TRUE
 #define TRUE (1)
 #endif
diff --git a/source/fitz/bidi.c b/source/fitz/bidi.c
index 8c56f23e..7c9607d9 100644
--- a/source/fitz/bidi.c
+++ b/source/fitz/bidi.c
@@ -37,6 +37,7 @@
 #include "mupdf/fitz.h"
 #include "mupdf/ucdn.h"
 #include "bidi-imp.h" /* standard bidi code interface */
+#include <assert.h>
 
 /*
  * Macros...
diff --git a/source/fitz/bitmap.c b/source/fitz/bitmap.c
index 9780b1dd..eefaebd7 100644
--- a/source/fitz/bitmap.c
+++ b/source/fitz/bitmap.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 static const unsigned char pkm[256*8] =
 {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/source/fitz/buffer.c b/source/fitz/buffer.c
index d432e810..8212f782 100644
--- a/source/fitz/buffer.c
+++ b/source/fitz/buffer.c
@@ -1,5 +1,8 @@
 #include "fitz-imp.h"
 
+#include <string.h>
+#include <stdarg.h>
+
 fz_buffer *
 fz_new_buffer(fz_context *ctx, size_t size)
 {
diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c
index c7385a60..eb24fb04 100644
--- a/source/fitz/colorspace.c
+++ b/source/fitz/colorspace.c
@@ -2,6 +2,10 @@
 
 #include "colorspace-imp.h"
 
+#include <assert.h>
+#include <math.h>
+#include <string.h>
+
 #define SLOWCMYK
 
 void
diff --git a/source/fitz/context.c b/source/fitz/context.c
index f62cd9d7..d0326270 100644
--- a/source/fitz/context.c
+++ b/source/fitz/context.c
@@ -1,5 +1,9 @@
 #include "fitz-imp.h"
 
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+
 struct fz_id_context_s
 {
 	int refs;
diff --git a/source/fitz/crypt-aes.c b/source/fitz/crypt-aes.c
index 87af5626..6cfca151 100644
--- a/source/fitz/crypt-aes.c
+++ b/source/fitz/crypt-aes.c
@@ -38,6 +38,8 @@
 
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 #define aes_context fz_aes
 
 /* AES block cipher implementation from XYSSL */
diff --git a/source/fitz/crypt-md5.c b/source/fitz/crypt-md5.c
index 6826fedd..46925b72 100644
--- a/source/fitz/crypt-md5.c
+++ b/source/fitz/crypt-md5.c
@@ -25,6 +25,8 @@ documentation and/or software.
 
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 /* Constants for MD5Transform routine */
 enum
 {
diff --git a/source/fitz/crypt-sha2.c b/source/fitz/crypt-sha2.c
index 20f827fe..27b6c277 100644
--- a/source/fitz/crypt-sha2.c
+++ b/source/fitz/crypt-sha2.c
@@ -11,6 +11,8 @@ SHA-384 and SHA-512 were also taken from Crypto++ and adapted for fitz.
 
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 static inline int isbigendian(void)
 {
 	static const int one = 1;
diff --git a/source/fitz/device.c b/source/fitz/device.c
index f79c8edf..21f74f65 100644
--- a/source/fitz/device.c
+++ b/source/fitz/device.c
@@ -1,5 +1,8 @@
+#include "mupdf/fitz.h"
 #include "fitz-imp.h"
 
+#include <string.h>
+
 fz_device *
 fz_new_device_of_size(fz_context *ctx, int size)
 {
diff --git a/source/fitz/directory.c b/source/fitz/directory.c
index 6e2750b9..6e216c94 100644
--- a/source/fitz/directory.c
+++ b/source/fitz/directory.c
@@ -1,5 +1,13 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#ifdef _MSC_VER
+#define stat _stat
+#endif
+
 typedef struct fz_directory_s fz_directory;
 struct fz_directory_s
 {
diff --git a/source/fitz/document.c b/source/fitz/document.c
index 8563196f..8f34026a 100644
--- a/source/fitz/document.c
+++ b/source/fitz/document.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 enum
 {
 	FZ_DOCUMENT_HANDLER_MAX = 10
diff --git a/source/fitz/draw-affine.c b/source/fitz/draw-affine.c
index 6e562ada..3b6e7ebd 100644
--- a/source/fitz/draw-affine.c
+++ b/source/fitz/draw-affine.c
@@ -1,6 +1,10 @@
 #include "mupdf/fitz.h"
 #include "draw-imp.h"
 
+#include <math.h>
+#include <float.h>
+#include <assert.h>
+
 typedef unsigned char byte;
 
 typedef void (paintfn_t)(byte * restrict dp, int da, const byte * restrict sp, int sw, int sh, int ss, int sa, int u, int v, int fa, int fb, int w, int n, int alpha, const byte * restrict color, byte * restrict hp);
diff --git a/source/fitz/draw-blend.c b/source/fitz/draw-blend.c
index e8d71932..f4a9fe96 100644
--- a/source/fitz/draw-blend.c
+++ b/source/fitz/draw-blend.c
@@ -1,6 +1,10 @@
 #include "mupdf/fitz.h"
 #include "draw-imp.h"
 
+#include <string.h>
+#include <math.h>
+#include <assert.h>
+
 /* PDF 1.4 blend modes. These are slow. */
 
 typedef unsigned char byte;
diff --git a/source/fitz/draw-device.c b/source/fitz/draw-device.c
index 63ea7a03..f4425558 100644
--- a/source/fitz/draw-device.c
+++ b/source/fitz/draw-device.c
@@ -2,6 +2,10 @@
 #include "glyph-cache-imp.h"
 #include "draw-imp.h"
 
+#include <string.h>
+#include <assert.h>
+#include <math.h>
+
 #define STACK_SIZE 96
 
 /* Enable the following to attempt to support knockout and/or isolated
@@ -50,6 +54,9 @@ struct fz_draw_device_s
 };
 
 #ifdef DUMP_GROUP_BLENDS
+
+#include <stdio.h>
+
 static int group_dump_count = 0;
 
 static void fz_dump_blend(fz_context *ctx, fz_pixmap *pix, const char *s)
diff --git a/source/fitz/draw-edge.c b/source/fitz/draw-edge.c
index bffb86d3..cb641b21 100644
--- a/source/fitz/draw-edge.c
+++ b/source/fitz/draw-edge.c
@@ -1,6 +1,12 @@
 #include "mupdf/fitz.h"
 #include "draw-imp.h"
 
+#include <string.h>
+#include <math.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <assert.h>
+
 #define BBOX_MIN -(1<<20)
 #define BBOX_MAX (1<<20)
 
diff --git a/source/fitz/draw-glyph.c b/source/fitz/draw-glyph.c
index ffe0d44b..7a6b9126 100644
--- a/source/fitz/draw-glyph.c
+++ b/source/fitz/draw-glyph.c
@@ -2,6 +2,9 @@
 #include "draw-imp.h"
 #include "glyph-cache-imp.h"
 
+#include <string.h>
+#include <math.h>
+
 #define MAX_GLYPH_SIZE 256
 #define MAX_CACHE_SIZE (1024*1024)
 
diff --git a/source/fitz/draw-mesh.c b/source/fitz/draw-mesh.c
index 233a2108..846e6bbc 100644
--- a/source/fitz/draw-mesh.c
+++ b/source/fitz/draw-mesh.c
@@ -1,6 +1,9 @@
 #include "mupdf/fitz.h"
 #include "draw-imp.h"
 
+#include <assert.h>
+#include <math.h>
+
 enum { MAXN = 2 + FZ_MAX_COLORS };
 
 static void paint_scan(fz_pixmap *restrict pix, int y, int fx0, int fx1, int cx0, int cx1, const int *restrict v0, const int *restrict v1, int n)
diff --git a/source/fitz/draw-paint.c b/source/fitz/draw-paint.c
index 2ec7d7d9..4d5ed9d1 100644
--- a/source/fitz/draw-paint.c
+++ b/source/fitz/draw-paint.c
@@ -1,6 +1,9 @@
 #include "mupdf/fitz.h"
 #include "draw-imp.h"
 
+#include <string.h>
+#include <assert.h>
+
 /*
 
 The functions in this file implement various flavours of Porter-Duff blending.
diff --git a/source/fitz/draw-path.c b/source/fitz/draw-path.c
index b339a92a..0dec60b8 100644
--- a/source/fitz/draw-path.c
+++ b/source/fitz/draw-path.c
@@ -1,6 +1,10 @@
 #include "mupdf/fitz.h"
 #include "draw-imp.h"
 
+#include <math.h>
+#include <float.h>
+#include <assert.h>
+
 #define MAX_DEPTH 8
 
 static void
diff --git a/source/fitz/draw-scale-simple.c b/source/fitz/draw-scale-simple.c
index 1d590922..16605079 100644
--- a/source/fitz/draw-scale-simple.c
+++ b/source/fitz/draw-scale-simple.c
@@ -13,6 +13,11 @@ intermediate results rather than ints.
 #include "mupdf/fitz.h"
 #include "draw-imp.h"
 
+#include <math.h>
+#include <string.h>
+#include <assert.h>
+#include <limits.h>
+
 /* Do we special case handling of single pixel high/wide images? The
  * 'purest' handling is given by not special casing them, but certain
  * files that use such images 'stack' them to give full images. Not
diff --git a/source/fitz/draw-unpack.c b/source/fitz/draw-unpack.c
index 414e68b7..e3c4c5b2 100644
--- a/source/fitz/draw-unpack.c
+++ b/source/fitz/draw-unpack.c
@@ -1,6 +1,8 @@
 #include "mupdf/fitz.h"
 #include "draw-imp.h"
 
+#include <string.h>
+
 /* Unpack image samples and optionally pad pixels with opaque alpha */
 
 #define get1(buf,x) ((buf[x >> 3] >> ( 7 - (x & 7) ) ) & 1 )
diff --git a/source/fitz/error.c b/source/fitz/error.c
index ac54e010..9c52d204 100644
--- a/source/fitz/error.c
+++ b/source/fitz/error.c
@@ -1,5 +1,11 @@
 #include "mupdf/fitz.h"
 
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #ifdef _MSC_VER
 #ifndef NDEBUG
 #define USE_OUTPUT_DEBUG_STRING
diff --git a/source/fitz/filter-basic.c b/source/fitz/filter-basic.c
index e3fa1ffa..8f3b18ac 100644
--- a/source/fitz/filter-basic.c
+++ b/source/fitz/filter-basic.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 /* Pretend we have a filter that just copies data forever */
 
 fz_stream *
diff --git a/source/fitz/filter-fax.c b/source/fitz/filter-fax.c
index 74297936..a4ca8ab5 100644
--- a/source/fitz/filter-fax.c
+++ b/source/fitz/filter-fax.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <limits.h>
+
 /* Fax G3/G4 decoder */
 
 /* TODO: uncompressed */
diff --git a/source/fitz/filter-flate.c b/source/fitz/filter-flate.c
index 562c9546..6154041b 100644
--- a/source/fitz/filter-flate.c
+++ b/source/fitz/filter-flate.c
@@ -2,6 +2,8 @@
 
 #include <zlib.h>
 
+#include <string.h>
+
 typedef struct fz_flate_s fz_flate;
 
 struct fz_flate_s
diff --git a/source/fitz/filter-leech.c b/source/fitz/filter-leech.c
index b6d139e2..cc98b972 100644
--- a/source/fitz/filter-leech.c
+++ b/source/fitz/filter-leech.c
@@ -2,6 +2,8 @@
 
 #include <zlib.h>
 
+#include <string.h>
+
 typedef struct fz_leech_s fz_leech;
 
 struct fz_leech_s
diff --git a/source/fitz/filter-lzw.c b/source/fitz/filter-lzw.c
index d7b97407..a7d7d430 100644
--- a/source/fitz/filter-lzw.c
+++ b/source/fitz/filter-lzw.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <assert.h>
+
 /* TODO: error checking */
 
 #define LZW_CLEAR(lzw)	(1 << ((lzw)->min_bits - 1))
diff --git a/source/fitz/filter-predict.c b/source/fitz/filter-predict.c
index 02475c41..d0b2717c 100644
--- a/source/fitz/filter-predict.c
+++ b/source/fitz/filter-predict.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <limits.h>
+
 /* TODO: check if this works with 16bpp images */
 
 typedef struct fz_predict_s fz_predict;
diff --git a/source/fitz/filter-sgi.c b/source/fitz/filter-sgi.c
index ceb2a548..c0946df2 100644
--- a/source/fitz/filter-sgi.c
+++ b/source/fitz/filter-sgi.c
@@ -1,6 +1,7 @@
-#include "mupdf/fitz/system.h"
-#include "mupdf/fitz/context.h"
-#include "mupdf/fitz/stream.h"
+#include "mupdf/fitz.h"
+
+#include <math.h>
+#include <string.h>
 
 /* Table stolen from LibTiff */
 #define UV_SQSIZ	0.003500f
diff --git a/source/fitz/filter-thunder.c b/source/fitz/filter-thunder.c
index 6e11ac5f..82d313a0 100644
--- a/source/fitz/filter-thunder.c
+++ b/source/fitz/filter-thunder.c
@@ -1,6 +1,4 @@
-#include "mupdf/fitz/system.h"
-#include "mupdf/fitz/context.h"
-#include "mupdf/fitz/stream.h"
+#include "mupdf/fitz.h"
 
 /* 4bit greyscale Thunderscan decoding */
 
diff --git a/source/fitz/font.c b/source/fitz/font.c
index 95f0933e..1ce8c89f 100644
--- a/source/fitz/font.c
+++ b/source/fitz/font.c
@@ -1,12 +1,14 @@
-#include "fitz-imp.h"
+#include "mupdf/fitz.h"
 #include "mupdf/ucdn.h"
-
+#include "fitz-imp.h"
 #include "font-imp.h"
 
 #include <ft2build.h>
 #include "hb.h"
 #include "hb-ft.h"
 
+#include <assert.h>
+
 #include FT_FREETYPE_H
 #include FT_ADVANCES_H
 #include FT_STROKER_H
diff --git a/source/fitz/ftoa.c b/source/fitz/ftoa.c
index 6cbf7f7e..134e2a0b 100644
--- a/source/fitz/ftoa.c
+++ b/source/fitz/ftoa.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <assert.h>
+
 /*
 	Convert IEEE single precision numbers into decimal ASCII strings, while
 	satisfying the following two properties:
diff --git a/source/fitz/geometry.c b/source/fitz/geometry.c
index 7a8d162b..1940b417 100644
--- a/source/fitz/geometry.c
+++ b/source/fitz/geometry.c
@@ -1,5 +1,9 @@
 #include "mupdf/fitz.h"
 
+#include <math.h>
+#include <float.h>
+#include <limits.h>
+
 #define MAX4(a,b,c,d) fz_max(fz_max(a,b), fz_max(c,d))
 #define MIN4(a,b,c,d) fz_min(fz_min(a,b), fz_min(c,d))
 
diff --git a/source/fitz/glyph-cache-imp.h b/source/fitz/glyph-cache-imp.h
index 8e3945fd..f21cfbb1 100644
--- a/source/fitz/glyph-cache-imp.h
+++ b/source/fitz/glyph-cache-imp.h
@@ -1,15 +1,6 @@
 #ifndef MUPDF_FITZ_GLYPH_CACHE_IMP_H
 #define MUPDF_FITZ_GLYPH_CACHE_IMP_H
 
-#include "mupdf/fitz/system.h"
-#include "mupdf/fitz/context.h"
-#include "mupdf/fitz/geometry.h"
-#include "mupdf/fitz/font.h"
-#include "mupdf/fitz/path.h"
-#include "mupdf/fitz/pixmap.h"
-#include "mupdf/fitz/device.h"
-#include "mupdf/fitz/glyph-cache.h"
-
 fz_path *fz_outline_glyph(fz_context *ctx, fz_font *font, int gid, const fz_matrix *ctm);
 fz_path *fz_outline_ft_glyph(fz_context *ctx, fz_font *font, int gid, const fz_matrix *trm);
 fz_glyph *fz_render_ft_glyph(fz_context *ctx, fz_font *font, int cid, const fz_matrix *trm, int aa);
diff --git a/source/fitz/glyph.c b/source/fitz/glyph.c
index efe5bed1..f5d97768 100644
--- a/source/fitz/glyph.c
+++ b/source/fitz/glyph.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 #define RLE_THRESHOLD 256
 
 fz_glyph *
diff --git a/source/fitz/halftone.c b/source/fitz/halftone.c
index 58153fcf..ff7e9cb1 100644
--- a/source/fitz/halftone.c
+++ b/source/fitz/halftone.c
@@ -1,5 +1,8 @@
+#include "mupdf/fitz.h"
 #include "fitz-imp.h"
 
+#include <assert.h>
+
 struct fz_halftone_s
 {
 	int refs;
diff --git a/source/fitz/harfbuzz.c b/source/fitz/harfbuzz.c
index 319e2b65..d2ff3bf5 100644
--- a/source/fitz/harfbuzz.c
+++ b/source/fitz/harfbuzz.c
@@ -7,6 +7,8 @@
 
 #include "hb.h"
 
+#include <assert.h>
+
 /* Harfbuzz has some major design flaws.
  *
  * It is utterly thread unsafe. It uses statics to hold
diff --git a/source/fitz/hash.c b/source/fitz/hash.c
index 9ebb0b31..38393caf 100644
--- a/source/fitz/hash.c
+++ b/source/fitz/hash.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <assert.h>
+
 /*
 Simple hashtable with open addressing linear probe.
 Unlike text book examples, removing entries works
diff --git a/source/fitz/image.c b/source/fitz/image.c
index 2ee1cfbb..057d6480 100644
--- a/source/fitz/image.c
+++ b/source/fitz/image.c
@@ -1,5 +1,9 @@
 #include "fitz-imp.h"
 
+#include <string.h>
+#include <math.h>
+#include <assert.h>
+
 #define SANE_DPI 72.0f
 #define INSANE_DPI 4800.0f
 
diff --git a/source/fitz/list-device.c b/source/fitz/list-device.c
index 1f0d19d6..49a93c20 100644
--- a/source/fitz/list-device.c
+++ b/source/fitz/list-device.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <assert.h>
+#include <string.h>
+
 typedef struct fz_display_node_s fz_display_node;
 typedef struct fz_list_device_s fz_list_device;
 
diff --git a/source/fitz/load-bmp.c b/source/fitz/load-bmp.c
index 21852128..fabc61ed 100644
--- a/source/fitz/load-bmp.c
+++ b/source/fitz/load-bmp.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <limits.h>
+
 static const unsigned char web_palette[] = {
 	0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x66, 0x00, 0x00, 0x99, 0x00, 0x00, 0xCC, 0x00, 0x00, 0xFF, 0x00, 0x00,
 	0x00, 0x00, 0x33, 0x33, 0x00, 0x33, 0x66, 0x00, 0x33, 0x99, 0x00, 0x33, 0xCC, 0x00, 0x33, 0xFF, 0x00, 0x33,
diff --git a/source/fitz/load-gif.c b/source/fitz/load-gif.c
index c8835774..546bd1a8 100644
--- a/source/fitz/load-gif.c
+++ b/source/fitz/load-gif.c
@@ -1,5 +1,8 @@
 #include "fitz-imp.h"
 
+#include <string.h>
+#include <limits.h>
+
 struct info
 {
 	int gif89a;
diff --git a/source/fitz/load-jpeg.c b/source/fitz/load-jpeg.c
index c9b83465..4a0992b7 100644
--- a/source/fitz/load-jpeg.c
+++ b/source/fitz/load-jpeg.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <limits.h>
+
 #include <jpeglib.h>
 
 #ifdef SHARE_JPEG
diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
index d01de585..4dadface 100644
--- a/source/fitz/load-jpx.c
+++ b/source/fitz/load-jpx.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <assert.h>
+#include <string.h>
+
 #if FZ_ENABLE_JPX
 
 typedef struct fz_jpxd_s fz_jpxd;
diff --git a/source/fitz/load-png.c b/source/fitz/load-png.c
index 74af414e..65935b8d 100644
--- a/source/fitz/load-png.c
+++ b/source/fitz/load-png.c
@@ -2,6 +2,8 @@
 
 #include <zlib.h>
 
+#include <string.h>
+
 struct info
 {
 	unsigned int width, height, depth, n;
diff --git a/source/fitz/load-pnm.c b/source/fitz/load-pnm.c
index 21bf939c..cf48da60 100644
--- a/source/fitz/load-pnm.c
+++ b/source/fitz/load-pnm.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <limits.h>
+
 enum
 {
 	PAM_UNKNOWN = 0,
diff --git a/source/fitz/load-tiff.c b/source/fitz/load-tiff.c
index 8d759254..4bc8be75 100644
--- a/source/fitz/load-tiff.c
+++ b/source/fitz/load-tiff.c
@@ -1,5 +1,9 @@
 #include "mupdf/fitz.h"
 
+#include <limits.h>
+#include <assert.h>
+#include <string.h>
+
 /*
  * TIFF image loader. Should be enough to support TIFF files in XPS.
  * Baseline TIFF 6.0 plus CMYK, LZW, Flate and JPEG support.
diff --git a/source/fitz/memento.c b/source/fitz/memento.c
index 5676cafd..46fbbe75 100644
--- a/source/fitz/memento.c
+++ b/source/fitz/memento.c
@@ -50,6 +50,7 @@ int atexit(void (*)(void));
 #endif
 
 #include <stdlib.h>
+#include <stdarg.h>
 
 #ifdef __ANDROID__
 #define MEMENTO_ANDROID
diff --git a/source/fitz/memory.c b/source/fitz/memory.c
index 10e6f318..42ac1d50 100644
--- a/source/fitz/memory.c
+++ b/source/fitz/memory.c
@@ -1,5 +1,9 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
 /* Enable FITZ_DEBUG_LOCKING_TIMES below if you want to check the times
  * for which locks are held too. */
 #ifdef FITZ_DEBUG_LOCKING
diff --git a/source/fitz/noto.c b/source/fitz/noto.c
index 226cb885..eb070261 100644
--- a/source/fitz/noto.c
+++ b/source/fitz/noto.c
@@ -1,6 +1,8 @@
 #include "mupdf/fitz.h"
 #include "mupdf/ucdn.h"
 
+#include <string.h>
+
 /*
 	Base 14 PDF fonts from URW.
 	Noto fonts from Google.
diff --git a/source/fitz/output-pcl.c b/source/fitz/output-pcl.c
index 99cc819f..da0b8f1b 100644
--- a/source/fitz/output-pcl.c
+++ b/source/fitz/output-pcl.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <limits.h>
+
 /* Lifted from ghostscript gdevjlm.h */
 /*
  * The notion that there is such a thing as a "PCL printer" is a fiction: no
diff --git a/source/fitz/output-pwg.c b/source/fitz/output-pwg.c
index 9d31f2a5..1b5f3812 100644
--- a/source/fitz/output-pwg.c
+++ b/source/fitz/output-pwg.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <assert.h>
+#include <string.h>
+
 typedef struct {
 	fz_band_writer super;
 	fz_pwg_options pwg;
diff --git a/source/fitz/output-tga.c b/source/fitz/output-tga.c
index e6e9a4a5..712f82fe 100644
--- a/source/fitz/output-tga.c
+++ b/source/fitz/output-tga.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 /*
  * Write pixmap to TGA file (with or without alpha channel)
  */
diff --git a/source/fitz/output.c b/source/fitz/output.c
index 961bafe5..a8194aed 100644
--- a/source/fitz/output.c
+++ b/source/fitz/output.c
@@ -1,5 +1,11 @@
+#include "mupdf/fitz.h"
 #include "fitz-imp.h"
 
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
 struct fz_output_context_s
 {
 	int refs;
@@ -304,11 +310,7 @@ fz_save_buffer(fz_context *ctx, fz_buffer *buf, const char *filename)
 fz_band_writer *fz_new_band_writer_of_size(fz_context *ctx, size_t size, fz_output *out)
 {
 	fz_band_writer *writer = fz_calloc(ctx, size, 1);
-
-	assert(size >= sizeof(*writer));
-
 	writer->out = out;
-
 	return writer;
 }
 
diff --git a/source/fitz/path.c b/source/fitz/path.c
index 120d2e9e..31ede8ec 100644
--- a/source/fitz/path.c
+++ b/source/fitz/path.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <assert.h>
+
 // Thoughts for further optimisations:
 // All paths start with MoveTo. We could probably avoid most cases where
 // we store that. The next thing after a close must be a move.
diff --git a/source/fitz/pixmap.c b/source/fitz/pixmap.c
index f1291dc2..ab7d068f 100644
--- a/source/fitz/pixmap.c
+++ b/source/fitz/pixmap.c
@@ -1,5 +1,10 @@
 #include "mupdf/fitz.h"
 
+#include <assert.h>
+#include <limits.h>
+#include <string.h>
+#include <math.h>
+
 fz_pixmap *
 fz_keep_pixmap(fz_context *ctx, fz_pixmap *pix)
 {
diff --git a/source/fitz/pool.c b/source/fitz/pool.c
index 59e4a0f2..a2cb6ffe 100644
--- a/source/fitz/pool.c
+++ b/source/fitz/pool.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 typedef struct fz_pool_node_s fz_pool_node;
 
 struct fz_pool_s
diff --git a/source/fitz/printf.c b/source/fitz/printf.c
index ddb8f17c..010c9298 100644
--- a/source/fitz/printf.c
+++ b/source/fitz/printf.c
@@ -1,5 +1,10 @@
 #include "mupdf/fitz.h"
 
+#include <float.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+
 static const char *fz_hex_digits = "0123456789abcdef";
 
 struct fmtbuf
diff --git a/source/fitz/shade.c b/source/fitz/shade.c
index 4e5b9a19..783a8630 100644
--- a/source/fitz/shade.c
+++ b/source/fitz/shade.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <math.h>
+
 typedef struct fz_mesh_processor_s fz_mesh_processor;
 
 struct fz_mesh_processor_s {
diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c
index 677ac4d6..0890043f 100644
--- a/source/fitz/stext-device.c
+++ b/source/fitz/stext-device.c
@@ -1,6 +1,9 @@
 #include "mupdf/fitz.h"
 #include "mupdf/ucdn.h"
 
+#include <math.h>
+#include <float.h>
+
 /* Extract text into an unsorted span soup. */
 
 #define LINE_DIST 0.9f
@@ -8,6 +11,7 @@
 #define SPACE_MAX_DIST 0.8f
 #define PARAGRAPH_DIST 0.5f
 
+#include <stdio.h> /* for debug printing */
 #undef DEBUG_SPANS
 #undef DEBUG_INTERNALS
 #undef DEBUG_LINE_HEIGHTS
diff --git a/source/fitz/stext-paragraph.c b/source/fitz/stext-paragraph.c
index 91f71040..0a717c1b 100644
--- a/source/fitz/stext-paragraph.c
+++ b/source/fitz/stext-paragraph.c
@@ -1,9 +1,14 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <assert.h>
+#include <math.h>
+
 /* Assemble span soup into blocks and lines. */
 
 #define MY_EPSILON 0.001f
 
+#include <stdio.h> /* for debug printing */
 #undef DEBUG_LINE_HEIGHTS
 #undef DEBUG_MASKS
 #undef DEBUG_ALIGN
diff --git a/source/fitz/stext-search.c b/source/fitz/stext-search.c
index 6a3ea526..00705208 100644
--- a/source/fitz/stext-search.c
+++ b/source/fitz/stext-search.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 static inline int fz_tolower(int c)
 {
 	/* TODO: proper unicode case folding */
diff --git a/source/fitz/stream-open.c b/source/fitz/stream-open.c
index d1d35cbb..3fe58712 100644
--- a/source/fitz/stream-open.c
+++ b/source/fitz/stream-open.c
@@ -1,5 +1,9 @@
 #include "fitz-imp.h"
 
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
 int
 fz_file_exists(fz_context *ctx, const char *path)
 {
diff --git a/source/fitz/stream-prog.c b/source/fitz/stream-prog.c
index 579c7c4f..dab746e0 100644
--- a/source/fitz/stream-prog.c
+++ b/source/fitz/stream-prog.c
@@ -1,5 +1,9 @@
-#include "mupdf/fitz/stream.h"
-#include "mupdf/fitz/string-util.h"
+#include "mupdf/fitz.h"
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
 
 /* File stream - progressive reading to simulate http download */
 
diff --git a/source/fitz/stream-read.c b/source/fitz/stream-read.c
index 2d2f28b1..118589f9 100644
--- a/source/fitz/stream-read.c
+++ b/source/fitz/stream-read.c
@@ -1,5 +1,7 @@
 #include "fitz-imp.h"
 
+#include <string.h>
+
 #define MIN_BOMB (100 << 20)
 
 size_t
diff --git a/source/fitz/string.c b/source/fitz/string.c
index e406cb03..9872d114 100644
--- a/source/fitz/string.c
+++ b/source/fitz/string.c
@@ -1,5 +1,11 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <errno.h>
+#include <math.h>
+#include <float.h>
+#include <stdlib.h>
+
 static inline int
 fz_tolower(int c)
 {
diff --git a/source/fitz/strtod.c b/source/fitz/strtod.c
index 35ddd6ed..1db6c155 100644
--- a/source/fitz/strtod.c
+++ b/source/fitz/strtod.c
@@ -13,11 +13,9 @@
 
 #include "mupdf/fitz.h"
 
-#include <stdio.h>
 #include <math.h>
 #include <float.h>
 #include <string.h>
-#include <stdlib.h>
 #include <errno.h>
 
 #ifndef INFINITY
diff --git a/source/fitz/strtof.c b/source/fitz/strtof.c
index c929ded2..2786a794 100644
--- a/source/fitz/strtof.c
+++ b/source/fitz/strtof.c
@@ -1,5 +1,9 @@
 #include "mupdf/fitz.h"
 
+#include <assert.h>
+#include <errno.h>
+#include <float.h>
+
 #ifndef INFINITY
 #define INFINITY (DBL_MAX+DBL_MAX)
 #endif
diff --git a/source/fitz/svg-device.c b/source/fitz/svg-device.c
index 9ae4f189..0ac96105 100644
--- a/source/fitz/svg-device.c
+++ b/source/fitz/svg-device.c
@@ -1,6 +1,9 @@
 #include "fitz-imp.h"
 #include "glyph-cache-imp.h"
 
+#include <string.h>
+#include <float.h>
+
 typedef struct svg_device_s svg_device;
 
 typedef struct tile_s tile;
diff --git a/source/fitz/tempfile.c b/source/fitz/tempfile.c
index fd7d0f5f..7c2bb1ff 100644
--- a/source/fitz/tempfile.c
+++ b/source/fitz/tempfile.c
@@ -7,6 +7,10 @@
  * if required.
  */
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h> /* for tempnam */
+
 /* For now, put temporary files with the hint. */
 #define USE_HINT_FOR_DIR
 
diff --git a/source/fitz/text.c b/source/fitz/text.c
index 454963b0..cf0b68be 100644
--- a/source/fitz/text.c
+++ b/source/fitz/text.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 fz_text *
 fz_new_text(fz_context *ctx)
 {
diff --git a/source/fitz/transition.c b/source/fitz/transition.c
index ec7d3f19..49207592 100644
--- a/source/fitz/transition.c
+++ b/source/fitz/transition.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 /*
 	FIXME: Currently transitions only work with alpha. Our app only
 	uses alpha.
diff --git a/source/fitz/tree.c b/source/fitz/tree.c
index 897e6914..070bbc71 100644
--- a/source/fitz/tree.c
+++ b/source/fitz/tree.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 /* AA-tree */
 
 struct fz_tree_s
diff --git a/source/fitz/ucdn.c b/source/fitz/ucdn.c
index 0ea99083..d6b4135e 100644
--- a/source/fitz/ucdn.c
+++ b/source/fitz/ucdn.c
@@ -17,6 +17,8 @@
 #include "mupdf/fitz.h"
 #include "mupdf/ucdn.h"
 
+#include <stdlib.h>
+
 typedef struct {
 	unsigned char category;
 	unsigned char combining;
diff --git a/source/fitz/untar.c b/source/fitz/untar.c
index e8d5f183..90b6f24d 100644
--- a/source/fitz/untar.c
+++ b/source/fitz/untar.c
@@ -1,5 +1,8 @@
 #include "fitz-imp.h"
 
+#include <string.h>
+#include <stdio.h>
+
 typedef struct tar_entry_s tar_entry;
 typedef struct fz_tar_archive_s fz_tar_archive;
 
diff --git a/source/fitz/unzip.c b/source/fitz/unzip.c
index 0e595c05..b0907fe8 100644
--- a/source/fitz/unzip.c
+++ b/source/fitz/unzip.c
@@ -2,6 +2,8 @@
 
 #include <zlib.h>
 
+#include <string.h>
+
 #if !defined (INT32_MAX)
 #define INT32_MAX 2147483647L
 #endif
diff --git a/source/fitz/util.c b/source/fitz/util.c
index 346ebaeb..23dab179 100644
--- a/source/fitz/util.c
+++ b/source/fitz/util.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <float.h>
+
 fz_display_list *
 fz_new_display_list_from_page(fz_context *ctx, fz_page *page)
 {
diff --git a/source/fitz/writer.c b/source/fitz/writer.c
index 6c774d47..bfac38c7 100644
--- a/source/fitz/writer.c
+++ b/source/fitz/writer.c
@@ -1,5 +1,7 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+
 /* Return non-null terminated pointers to key/value entries in comma separated
  * option string. A plain key has the default value 'yes'. Use strncmp to compare
  * key/value strings. */
diff --git a/source/fitz/xml.c b/source/fitz/xml.c
index a81ab66d..989d65b6 100644
--- a/source/fitz/xml.c
+++ b/source/fitz/xml.c
@@ -1,5 +1,8 @@
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <stdlib.h>
+
 static const struct { const char *ent; int ucs; } html_entities[] = {
 	{"nbsp",160}, {"iexcl",161}, {"cent",162}, {"pound",163},
 	{"curren",164}, {"yen",165}, {"brvbar",166}, {"sect",167},
diff --git a/source/fitz/zip.c b/source/fitz/zip.c
index 6b7dca34..45ce4488 100644
--- a/source/fitz/zip.c
+++ b/source/fitz/zip.c
@@ -1,5 +1,8 @@
+#include "mupdf/fitz.h"
 #include "fitz-imp.h"
 
+#include <string.h>
+
 #include <zlib.h>
 
 #if !defined (INT32_MAX)