diff --git a/common/log.c b/common/log.c
index 495d489b..c65f428c 100644
--- a/common/log.c
+++ b/common/log.c
@@ -21,15 +21,15 @@
  * common/log.c
  */
 
+#include <stdbool.h>
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <common/log.h>
-#include <common/cmdlib.h>
 #include <common/threads.h>
 
 static FILE *logfile;
-static qboolean log_ok;
+static _Bool log_ok;
 
 void
 init_log(const char *filename)
diff --git a/common/threads.c b/common/threads.c
index b55f8f5f..f1f097f2 100644
--- a/common/threads.c
+++ b/common/threads.c
@@ -1,13 +1,15 @@
 /* common/threads.c */
 
+#include <stdbool.h>
 #include <stdint.h>
+#include <stdlib.h>
 
 #include <common/cmdlib.h>
 #include <common/log.h>
 #include <common/threads.h>
 
 /* Make the locks no-ops if we aren't running threads */
-static qboolean threads_active = false;
+static _Bool threads_active = false;
 
 static int dispatch;
 static int workcount;
diff --git a/include/common/log.h b/include/common/log.h
index d9a60f5c..bdd65ae0 100644
--- a/include/common/log.h
+++ b/include/common/log.h
@@ -28,7 +28,6 @@
 #define __COMMON_LOG_H__
 
 #include <stdio.h>
-#include <common/cmdlib.h>
 
 void init_log(const char *filename);
 void close_log();
diff --git a/include/common/threads.h b/include/common/threads.h
index e4c4ad44..3ef67375 100644
--- a/include/common/threads.h
+++ b/include/common/threads.h
@@ -3,8 +3,6 @@
 #ifndef __COMMON_THREADS_H__
 #define __COMMON_THREADS_H__
 
-#include <common/cmdlib.h>
-
 extern int numthreads;
 
 int GetDefaultThreads(void);