diff --git a/include/status.h b/include/status.h
index ca8241eef..03e205179 100644
--- a/include/status.h
+++ b/include/status.h
@@ -7,6 +7,7 @@
 #define _STATUS_H
 
 #include <stdio.h>
+#include <time.h>
 #include <inttypes.h>
 
 double get_avg_exec_time (hc_device_param_t *device_param, const int last_num_entries);
diff --git a/src/opencl.c b/src/opencl.c
index a0d45681c..f3bb5557f 100644
--- a/src/opencl.c
+++ b/src/opencl.c
@@ -5,40 +5,26 @@
 
 #include "common.h"
 #include "types.h"
-#include "timer.h"
 #include "memory.h"
 #include "logging.h"
 #include "locking.h"
-#include "ext_ADL.h"
-#include "ext_nvapi.h"
-#include "ext_nvml.h"
-#include "ext_xnvctrl.h"
-#include "ext_OpenCL.h"
-#include "cpu_md5.h"
-#include "interface.h"
-#include "tuningdb.h"
 #include "thread.h"
-#include "opencl.h"
-#include "hwmon.h"
-#include "restore.h"
-#include "hash_management.h"
-#include "status.h"
-#include "stdout.h"
-#include "mpsp.h"
+#include "timer.h"
+#include "tuningdb.h"
 #include "rp_cpu.h"
-#include "outfile.h"
-#include "potfile.h"
-#include "debugfile.h"
-#include "loopback.h"
-#include "data.h"
-#include "shared.h"
-#include "filehandling.h"
-#include "convert.h"
-#include "dictstat.h"
-#include "wordlist.h"
 #include "terminal.h"
-
-extern hc_global_data_t data;
+#include "mpsp.h"
+#include "straight.h"
+#include "combinator.h"
+#include "convert.h"
+#include "stdout.h"
+#include "filehandling.h"
+#include "interface.h"
+#include "wordlist.h"
+#include "shared.h"
+#include "hash_management.h"
+#include "cpu_md5.h"
+#include "opencl.h"
 
 extern const int comptime;
 
diff --git a/src/status.c b/src/status.c
index be33cb806..9de74ba2a 100644
--- a/src/status.c
+++ b/src/status.c
@@ -5,33 +5,15 @@
 
 #include "common.h"
 #include "types.h"
-#include "interface.h"
-#include "timer.h"
 #include "memory.h"
 #include "logging.h"
-#include "ext_OpenCL.h"
-#include "ext_ADL.h"
-#include "ext_nvapi.h"
-#include "ext_nvml.h"
-#include "ext_xnvctrl.h"
-#include "tuningdb.h"
-#include "thread.h"
-#include "opencl.h"
-#include "hwmon.h"
 #include "restore.h"
-#include "hash_management.h"
-#include "rp_cpu.h"
-#include "terminal.h"
-#include "mpsp.h"
-#include "outfile.h"
-#include "potfile.h"
-#include "debugfile.h"
-#include "loopback.h"
-#include "data.h"
+#include "thread.h"
+#include "timer.h"
+#include "interface.h"
+#include "hwmon.h"
 #include "status.h"
 
-extern hc_global_data_t  data;
-
 static const char ST_0000[] = "Initializing";
 static const char ST_0001[] = "Autotuning";
 static const char ST_0002[] = "Running";