diff --git a/include/outfile_check.h b/include/outfile_check.h
index edc81b297..22a563245 100644
--- a/include/outfile_check.h
+++ b/include/outfile_check.h
@@ -6,6 +6,9 @@
 #ifndef _OUTFILE_CHECK_H
 #define _OUTFILE_CHECK_H
 
+#include <unistd.h>
+#include <errno.h>
+
 #define OUTFILES_DIR "outfiles"
 
 void *thread_outfile_remove (void *p);
diff --git a/src/outfile_check.c b/src/outfile_check.c
index c876a209f..b68d051ba 100644
--- a/src/outfile_check.c
+++ b/src/outfile_check.c
@@ -7,32 +7,16 @@
 #include "types.h"
 #include "memory.h"
 #include "logging.h"
-#include "interface.h"
-#include "timer.h"
-#include "folder.h"
-#include "ext_OpenCL.h"
-#include "ext_ADL.h"
-#include "ext_nvapi.h"
-#include "ext_nvml.h"
-#include "ext_xnvctrl.h"
-#include "mpsp.h"
-#include "rp_cpu.h"
-#include "tuningdb.h"
-#include "thread.h"
-#include "opencl.h"
-#include "hwmon.h"
-#include "restore.h"
-#include "hashes.h"
-#include "outfile.h"
-#include "potfile.h"
-#include "debugfile.h"
-#include "loopback.h"
-#include "data.h"
-#include "status.h"
-#include "convert.h"
-#include "shared.h"
 #include "outfile_check.h"
 
+#include "convert.h"
+#include "data.h"
+#include "folder.h"
+#include "hashes.h"
+#include "interface.h"
+#include "shared.h"
+#include "thread.h"
+
 extern hc_global_data_t data;
 
 void *thread_outfile_remove (void *p)