14 files changed, 67 insertions, 0 deletions
diff --git a/source/tools/muconvert.c b/source/tools/muconvert.c
index 054f8b25..99d5c774 100644
--- a/source/tools/muconvert.c
+++ b/source/tools/muconvert.c
@@ -4,6 +4,9 @@
 
 #include "mupdf/fitz.h"
 
+#include <stdlib.h>
+#include <stdio.h>
+
 /* input options */
 static const char *password = "";
 static int alphabits = 8;
diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c
index f1d085ec..a2edd524 100644
--- a/source/tools/mudraw.c
+++ b/source/tools/mudraw.c
@@ -12,6 +12,11 @@
 #include "mupdf/helpers/mu-threads.h"
 #endif
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/time.h> /* for gettimeofday */
+
 /* Enable for helpful threading debug */
 /* #define DEBUG_THREADS(A) do { printf A; fflush(stdout); } while (0) */
 #define DEBUG_THREADS(A) do { } while (0)
diff --git a/source/tools/muraster.c b/source/tools/muraster.c
index b8d9a4d9..12b81ac3 100644
--- a/source/tools/muraster.c
+++ b/source/tools/muraster.c
@@ -139,6 +139,18 @@
 #include "mupdf/fitz.h"
 #include "mupdf/helpers/mu-threads.h"
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifdef _MSC_VER
+struct timeval;
+struct timezone;
+int gettimeofday(struct timeval *tv, struct timezone *tz);
+#else
+#include <sys/time.h>
+#endif
+
 /*
 	After this point, we convert the #defines set (or not set)
 	above into sensible values we can work with. Don't edit
diff --git a/source/tools/murun.c b/source/tools/murun.c
index 76cb54e4..f0deaf60 100644
--- a/source/tools/murun.c
+++ b/source/tools/murun.c
@@ -8,6 +8,10 @@
 
 #include "mujs.h"
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
 #define PS1 "> "
 
 FZ_NORETURN static void rethrow(js_State *J)
diff --git a/source/tools/mutool.c b/source/tools/mutool.c
index 8cba3cff..68c647a4 100644
--- a/source/tools/mutool.c
+++ b/source/tools/mutool.c
@@ -4,6 +4,9 @@
 
 #include "mupdf/fitz.h"
 
+#include <string.h>
+#include <stdio.h>
+
 #ifdef _MSC_VER
 #define main main_utf8
 #endif
diff --git a/source/tools/pdfclean.c b/source/tools/pdfclean.c
index 5dd0d700..ff60bbb5 100644
--- a/source/tools/pdfclean.c
+++ b/source/tools/pdfclean.c
@@ -9,8 +9,13 @@
  * TODO: linearize document for fast web view
  */
 
+#include "mupdf/fitz.h"
 #include "mupdf/pdf.h"
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
 static void usage(void)
 {
 	fprintf(stderr,
diff --git a/source/tools/pdfcreate.c b/source/tools/pdfcreate.c
index d7d8e4a9..f4fec946 100644
--- a/source/tools/pdfcreate.c
+++ b/source/tools/pdfcreate.c
@@ -4,8 +4,13 @@
  * Simple test bed to work with adding content and creating PDFs
  */
 
+#include "mupdf/fitz.h"
 #include "mupdf/pdf.h"
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
 static void usage(void)
 {
 	fprintf(stderr,
diff --git a/source/tools/pdfextract.c b/source/tools/pdfextract.c
index c7390392..49a2747e 100644
--- a/source/tools/pdfextract.c
+++ b/source/tools/pdfextract.c
@@ -2,8 +2,12 @@
  * pdfextract -- the ultimate way to extract images and fonts from pdfs
  */
 
+#include "mupdf/fitz.h"
 #include "mupdf/pdf.h"
 
+#include <stdlib.h>
+#include <stdio.h>
+
 static pdf_document *doc = NULL;
 static fz_context *ctx = NULL;
 static int dorgb = 0;
diff --git a/source/tools/pdfinfo.c b/source/tools/pdfinfo.c
index 8fac93f6..585279b1 100644
--- a/source/tools/pdfinfo.c
+++ b/source/tools/pdfinfo.c
@@ -3,8 +3,13 @@
  * Print information about the input pdf.
  */
 
+#include "mupdf/fitz.h"
 #include "mupdf/pdf.h"
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
 enum
 {
 	DIMENSIONS = 0x01,
diff --git a/source/tools/pdfmerge.c b/source/tools/pdfmerge.c
index 153d87ff..7e38f0e1 100644
--- a/source/tools/pdfmerge.c
+++ b/source/tools/pdfmerge.c
@@ -4,8 +4,12 @@
  * Simple test bed to work with merging pages from multiple PDFs into a single PDF.
  */
 
+#include "mupdf/fitz.h"
 #include "mupdf/pdf.h"
 
+#include <stdlib.h>
+#include <stdio.h>
+
 static void usage(void)
 {
 	fprintf(stderr,
diff --git a/source/tools/pdfpages.c b/source/tools/pdfpages.c
index 598f7594..9e8f6050 100644
--- a/source/tools/pdfpages.c
+++ b/source/tools/pdfpages.c
@@ -3,8 +3,12 @@
  * Print information about pages of a pdf.
  */
 
+#include "mupdf/fitz.h"
 #include "mupdf/pdf.h"
 
+#include <stdlib.h>
+#include <stdio.h>
+
 static void
 infousage(void)
 {
diff --git a/source/tools/pdfportfolio.c b/source/tools/pdfportfolio.c
index b4488cd4..b1dc71bd 100644
--- a/source/tools/pdfportfolio.c
+++ b/source/tools/pdfportfolio.c
@@ -2,8 +2,12 @@
  * pdfportfolio -- manipulate embedded files in a PDF
  */
 
+#include "mupdf/fitz.h"
 #include "mupdf/pdf.h"
 
+#include <stdlib.h>
+#include <stdio.h>
+
 static pdf_document *doc = NULL;
 static fz_context *ctx = NULL;
 
diff --git a/source/tools/pdfposter.c b/source/tools/pdfposter.c
index 66eaa3a5..753a4da3 100644
--- a/source/tools/pdfposter.c
+++ b/source/tools/pdfposter.c
@@ -2,8 +2,13 @@
  * PDF posteriser; split pages within a PDF file into smaller lumps.
  */
 
+#include "mupdf/fitz.h"
 #include "mupdf/pdf.h"
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
 static int x_factor = 0;
 static int y_factor = 0;
 
diff --git a/source/tools/pdfshow.c b/source/tools/pdfshow.c
index 03c93da8..71d2b4ca 100644
--- a/source/tools/pdfshow.c
+++ b/source/tools/pdfshow.c
@@ -2,8 +2,12 @@
  * pdfshow -- the ultimate pdf debugging tool
  */
 
+#include "mupdf/fitz.h"
 #include "mupdf/pdf.h"
 
+#include <stdlib.h>
+#include <stdio.h>
+
 static pdf_document *doc = NULL;
 static fz_context *ctx = NULL;
 static fz_output *out = NULL;