diff --git a/include/wordlist.h b/include/wordlist.h
index bbf13a5b0..a2c4fe211 100644
--- a/include/wordlist.h
+++ b/include/wordlist.h
@@ -6,6 +6,9 @@
 #ifndef _WORDLIST_H
 #define _WORDLIST_H
 
+#include <time.h>
+#include <inttypes.h>
+
 uint convert_from_hex (char *line_buf, const uint line_len, const user_options_t *user_options);
 
 void load_segment (wl_data_t *wl_data, FILE *fd);
diff --git a/src/hwmon.c b/src/hwmon.c
index 98a2b4793..d8079d6af 100644
--- a/src/hwmon.c
+++ b/src/hwmon.c
@@ -7,7 +7,7 @@
 #include "types.h"
 #include "memory.h"
 #include "logging.h"
-#include "data.h"
+#include "hwmon.h"
 
 hc_thread_mutex_t mux_hwmon;
 
@@ -666,7 +666,7 @@ int hm_get_throttle_with_device_id (const hwmon_ctx_t *hwmon_ctx, const opencl_c
   return -1;
 }
 
-int hm_set_fanspeed_with_device_id_adl (hwmon_ctx_t *hwmon_ctx, const uint device_id, const int fanspeed, const int fanpolicy)
+int hm_set_fanspeed_with_device_id_adl (const hwmon_ctx_t *hwmon_ctx, const uint device_id, const int fanspeed, const int fanpolicy)
 {
   if (hwmon_ctx->hm_device[device_id].fan_set_supported == true)
   {
@@ -724,7 +724,7 @@ int hm_set_fanspeed_with_device_id_adl (hwmon_ctx_t *hwmon_ctx, const uint devic
   return -1;
 }
 
-int hm_set_fanspeed_with_device_id_nvapi (hwmon_ctx_t *hwmon_ctx, const uint device_id, const int fanspeed, const int fanpolicy)
+int hm_set_fanspeed_with_device_id_nvapi (const hwmon_ctx_t *hwmon_ctx, const uint device_id, const int fanspeed, const int fanpolicy)
 {
   if (hwmon_ctx->hm_device[device_id].fan_set_supported == true)
   {
@@ -757,7 +757,7 @@ int hm_set_fanspeed_with_device_id_nvapi (hwmon_ctx_t *hwmon_ctx, const uint dev
   return -1;
 }
 
-int hm_set_fanspeed_with_device_id_xnvctrl (hwmon_ctx_t *hwmon_ctx, const uint device_id, const int fanspeed)
+int hm_set_fanspeed_with_device_id_xnvctrl (const hwmon_ctx_t *hwmon_ctx, const uint device_id, const int fanspeed)
 {
   if (hwmon_ctx->hm_device[device_id].fan_set_supported == true)
   {
diff --git a/src/wordlist.c b/src/wordlist.c
index ee688a769..9d3347c48 100644
--- a/src/wordlist.c
+++ b/src/wordlist.c
@@ -5,38 +5,14 @@
 
 #include "common.h"
 #include "types.h"
-#include "interface.h"
-#include "timer.h"
 #include "memory.h"
-#include "convert.h"
 #include "logging.h"
-#include "logfile.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 "locking.h"
-#include "rp_cpu.h"
-#include "rp_kernel_on_cpu.h"
-#include "shared.h"
+#include "convert.h"
 #include "dictstat.h"
-#include "mpsp.h"
-#include "outfile.h"
-#include "potfile.h"
-#include "debugfile.h"
-#include "loopback.h"
-#include "data.h"
+#include "thread.h"
+#include "rp_cpu.h"
 #include "wordlist.h"
 
-extern hc_global_data_t data;
-
 uint convert_from_hex (char *line_buf, const uint line_len, const user_options_t *user_options)
 {
   if (line_len & 1) return (line_len); // not in hex
@@ -443,7 +419,7 @@ void wl_data_init (wl_data_t *wl_data, const user_options_t *user_options, const
     wl_data->func = get_next_word_uc;
   }
 
-  if (hashconfig->hash_type == HASH_TYPE_LM) // yes that's fine that way
+  if (hashconfig->hash_mode == 3000) // yes that's fine that way
   {
     wl_data->func = get_next_word_lm;
   }