iwyu: use iwyu to fix includes across the code

19 files changed, 46 insertions, 54 deletions

diff --git a/Makefile b/Makefile
index 0b39f991..cdcd4d92 100644
--- a/Makefile
+++ b/Makefile
@@ -374,17 +374,16 @@ install: all
 
 # DO NOT DELETE
 
-cmdline.o: cmdline.h honggfuzz.h libhfcommon/util.h libhfcommon/common.h
-cmdline.o: display.h libhfcommon/files.h libhfcommon/common.h
+cmdline.o: cmdline.h honggfuzz.h libhfcommon/util.h display.h
+cmdline.o: libhfcommon/common.h libhfcommon/files.h libhfcommon/common.h
 cmdline.o: libhfcommon/log.h
 display.o: display.h honggfuzz.h libhfcommon/util.h libhfcommon/common.h
 display.o: libhfcommon/log.h
 fuzz.o: fuzz.h honggfuzz.h libhfcommon/util.h arch.h input.h
 fuzz.o: libhfcommon/common.h libhfcommon/files.h libhfcommon/common.h
-fuzz.o: libhfcommon/log.h mangle.h report.h sanitizers.h socketfuzzer.h
-fuzz.o: subproc.h
-honggfuzz.o: cmdline.h honggfuzz.h libhfcommon/util.h libhfcommon/common.h
-honggfuzz.o: display.h fuzz.h input.h libhfcommon/files.h
+fuzz.o: libhfcommon/log.h report.h sanitizers.h socketfuzzer.h subproc.h
+honggfuzz.o: cmdline.h honggfuzz.h libhfcommon/util.h display.h fuzz.h
+honggfuzz.o: input.h libhfcommon/common.h libhfcommon/files.h
 honggfuzz.o: libhfcommon/common.h libhfcommon/log.h socketfuzzer.h subproc.h
 input.o: input.h honggfuzz.h libhfcommon/util.h fuzz.h libhfcommon/common.h
 input.o: libhfcommon/files.h libhfcommon/common.h libhfcommon/log.h mangle.h
@@ -392,10 +391,9 @@ input.o: subproc.h
 mangle.o: mangle.h honggfuzz.h libhfcommon/util.h input.h
 mangle.o: libhfcommon/common.h libhfcommon/log.h
 report.o: report.h honggfuzz.h libhfcommon/util.h sanitizers.h
-report.o: libhfcommon/common.h libhfcommon/log.h
+report.o: libhfcommon/log.h
 sanitizers.o: sanitizers.h honggfuzz.h libhfcommon/util.h cmdline.h
-sanitizers.o: libhfcommon/common.h libhfcommon/files.h libhfcommon/common.h
-sanitizers.o: libhfcommon/log.h
+sanitizers.o: libhfcommon/common.h libhfcommon/log.h
 socketfuzzer.o: socketfuzzer.h honggfuzz.h libhfcommon/util.h
 socketfuzzer.o: libhfcommon/common.h libhfcommon/files.h libhfcommon/common.h
 socketfuzzer.o: libhfcommon/log.h libhfcommon/ns.h
@@ -419,8 +417,7 @@ libhfnetdriver/netdriver.o: libhfcommon/util.h libhfcommon/common.h
 libhfnetdriver/netdriver.o: libhfcommon/files.h libhfcommon/common.h
 libhfnetdriver/netdriver.o: libhfcommon/log.h libhfcommon/ns.h
 libhfuzz/fetch.o: libhfuzz/fetch.h honggfuzz.h libhfcommon/util.h
-libhfuzz/fetch.o: libhfcommon/common.h libhfcommon/files.h
-libhfuzz/fetch.o: libhfcommon/common.h libhfcommon/log.h
+libhfuzz/fetch.o: libhfcommon/files.h libhfcommon/common.h libhfcommon/log.h
 libhfuzz/instrument.o: libhfuzz/instrument.h honggfuzz.h libhfcommon/util.h
 libhfuzz/instrument.o: libhfcommon/common.h libhfcommon/files.h
 libhfuzz/instrument.o: libhfcommon/common.h libhfcommon/log.h
diff --git a/cmdline.c b/cmdline.c
index dc1500fe..35d7ba74 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -30,15 +30,18 @@
 #if defined(_HF_ARCH_LINUX)
 #include <sched.h>
 #endif /* defined(_HF_ARCH_LINUX) */
-#include <signal.h>
+#include <pthread.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/mman.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "display.h"
diff --git a/cmdline.h b/cmdline.h
index 60327f3f..a640ad18 100644
--- a/cmdline.h
+++ b/cmdline.h
@@ -22,11 +22,10 @@
 #ifndef _HF_CMDLINE_H_
 #define _HF_CMDLINE_H_
 
+#include <stdbool.h>
 #include <sys/resource.h>
-#include <sys/time.h>
 
 #include "honggfuzz.h"
-#include "libhfcommon/common.h"
 
 rlim_t cmdlineParseRLimit(int res, const char* optarg, unsigned long mul);
 
diff --git a/display.c b/display.c
index f711a9c5..f0950322 100644
--- a/display.c
+++ b/display.c
@@ -25,11 +25,13 @@
 
 #include <errno.h>
 #include <inttypes.h>
-#include <math.h>
 #include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "libhfcommon/common.h"
diff --git a/fuzz.c b/fuzz.c
index d55bc567..cd98cf06 100644
--- a/fuzz.c
+++ b/fuzz.c
@@ -27,19 +27,13 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <libgen.h>
-#include <math.h>
+#include <limits.h>
 #include <pthread.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
@@ -51,7 +45,6 @@
 #include "libhfcommon/files.h"
 #include "libhfcommon/log.h"
 #include "libhfcommon/util.h"
-#include "mangle.h"
 #include "report.h"
 #include "sanitizers.h"
 #include "socketfuzzer.h"
diff --git a/fuzz.h b/fuzz.h
index 61dc2bc0..24e281ac 100644
--- a/fuzz.h
+++ b/fuzz.h
@@ -8,7 +8,6 @@
  * Copyright 2010-2018 by Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
  * a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
@@ -24,9 +23,8 @@
 #ifndef _HF_FUZZ_H_
 #define _HF_FUZZ_H_
 
-#include <pthread.h>
-
-#include "honggfuzz.h"
+#include <honggfuzz.h>
+#include <stdbool.h>
 
 extern void        fuzz_threadsStart(honggfuzz_t* fuzz);
 extern bool        fuzz_isTerminating(void);
diff --git a/honggfuzz.c b/honggfuzz.c
index 068bc131..ebc191e0 100644
--- a/honggfuzz.c
+++ b/honggfuzz.c
@@ -23,13 +23,11 @@
  */
 
 #include <errno.h>
-#include <getopt.h>
 #include <inttypes.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <time.h>
diff --git a/honggfuzz.h b/honggfuzz.h
index 63016e4c..a656e1a4 100644
--- a/honggfuzz.h
+++ b/honggfuzz.h
@@ -28,6 +28,7 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <pthread.h>
+#include <signal.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/param.h>
diff --git a/input.c b/input.c
index b4650d6b..7c49642e 100644
--- a/input.c
+++ b/input.c
@@ -26,14 +26,13 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
+#include <sys/queue.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "fuzz.h"
diff --git a/input.h b/input.h
index 34defac5..eedeccb1 100644
--- a/input.h
+++ b/input.h
@@ -25,6 +25,9 @@
 #define _HF_INPUT_H_
 
 #include <limits.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "honggfuzz.h"
 
diff --git a/libhfuzz/fetch.c b/libhfuzz/fetch.c
index 80275eeb..145dbabf 100644
--- a/libhfuzz/fetch.c
+++ b/libhfuzz/fetch.c
@@ -2,16 +2,12 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <inttypes.h>
-#include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
 #include "honggfuzz.h"
-#include "libhfcommon/common.h"
 #include "libhfcommon/files.h"
 #include "libhfcommon/log.h"
 
diff --git a/libhfuzz/fetch.h b/libhfuzz/fetch.h
index e08f33d1..a15d6067 100644
--- a/libhfuzz/fetch.h
+++ b/libhfuzz/fetch.h
@@ -24,10 +24,9 @@
 #ifndef _HF_LIBHFUZZ_FETCH_H_
 #define _HF_LIBHFUZZ_FETCH_H_
 
-#include <inttypes.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
-#include <unistd.h>
 
 extern void HonggfuzzFetchData(const uint8_t** buf_ptr, size_t* len_ptr);
 extern bool fetchIsInputAvailable(void);
diff --git a/libhfuzz/instrument.c b/libhfuzz/instrument.c
index 32ce946a..51f563c3 100644
--- a/libhfuzz/instrument.c
+++ b/libhfuzz/instrument.c
@@ -2,17 +2,17 @@
 
 #include <ctype.h>
 #include <dlfcn.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #if defined(_HF_ARCH_LINUX)
 #include <linux/mman.h>
 #endif /* defined(_HF_ARCH_LINUX) */
+#include <pthread.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/libhfuzz/instrument.h b/libhfuzz/instrument.h
index 374999d4..791a9f3d 100644
--- a/libhfuzz/instrument.h
+++ b/libhfuzz/instrument.h
@@ -24,9 +24,9 @@
 #ifndef _HF_LIBHFUZZ_INSTRUMENT_H_
 #define _HF_LIBHFUZZ_INSTRUMENT_H_
 
-#include <inttypes.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 
 extern void     instrument8BitCountersCount(void);
 extern void     instrumentResetLocalCovFeedback(void);
diff --git a/mangle.c b/mangle.c
index 0e0660b9..ee25203b 100644
--- a/mangle.c
+++ b/mangle.c
@@ -26,14 +26,13 @@
 
 #include <ctype.h>
 #include <inttypes.h>
-#include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <time.h>
 
 #include "input.h"
 #include "libhfcommon/common.h"
diff --git a/report.c b/report.c
index 5bfb5ce6..a7f6396e 100644
--- a/report.c
+++ b/report.c
@@ -26,10 +26,10 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <signal.h>
+#include <limits.h>
 #include <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
 
 #include "libhfcommon/common.h"
 #include "libhfcommon/log.h"
diff --git a/report.h b/report.h
index 22eaf4e4..c924509a 100644
--- a/report.h
+++ b/report.h
@@ -24,7 +24,10 @@
 #ifndef _HF_REPORT_H_
 #define _HF_REPORT_H_
 
+#include <stdint.h>
+
 #include "honggfuzz.h"
+#include "libhfcommon/util.h"
 #include "sanitizers.h"
 
 extern void report_saveReport(run_t* run);
diff --git a/sanitizers.c b/sanitizers.c
index 6509eee6..63ced358 100644
--- a/sanitizers.c
+++ b/sanitizers.c
@@ -1,18 +1,16 @@
 #include "sanitizers.h"
 
 #include <ctype.h>
-#include <dirent.h>
 #include <inttypes.h>
+#include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <unistd.h>
 
 #include "cmdline.h"
 #include "libhfcommon/common.h"
-#include "libhfcommon/files.h"
 #include "libhfcommon/log.h"
 #include "libhfcommon/util.h"
 
diff --git a/sanitizers.h b/sanitizers.h
index 8ca727d1..4a6f397f 100644
--- a/sanitizers.h
+++ b/sanitizers.h
@@ -20,7 +20,11 @@
 #ifndef _HF_SANITIZERS_H_
 #define _HF_SANITIZERS_H_
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #include "honggfuzz.h"
+#include "libhfcommon/util.h"
 
 /* Prefix for sanitizer report files */
 #define kLOGPREFIX "HF.sanitizer.log"