diff --git a/src/thread/channel.c b/src/thread/channel.c
index 07691729..b6a744f3 100644
--- a/src/thread/channel.c
+++ b/src/thread/channel.c
@@ -1,7 +1,6 @@
 #include "thread/channel.h"
 #include "util.h"
 #include <math.h>
-#include <stdlib.h>
 
 Channel* lovrChannelInit(Channel* channel) {
   vec_init(&channel->messages);
diff --git a/src/thread/thread.c b/src/thread/thread.c
index ad52476d..83edcf08 100644
--- a/src/thread/thread.c
+++ b/src/thread/thread.c
@@ -1,9 +1,12 @@
 #include "thread/thread.h"
 #include "thread/channel.h"
 #include "util.h"
-#include <stdlib.h>
+#include "lib/map/map.h"
 
-static ThreadState state;
+static struct {
+  bool initialized;
+  map_void_t channels;
+} state;
 
 bool lovrThreadModuleInit() {
   if (state.initialized) return false;
diff --git a/src/thread/thread.h b/src/thread/thread.h
index a46c1fe7..59121124 100644
--- a/src/thread/thread.h
+++ b/src/thread/thread.h
@@ -1,18 +1,12 @@
 #include "types.h"
 #include "data/blob.h"
 #include "lib/tinycthread/tinycthread.h"
-#include "lib/map/map.h"
 #include <stdbool.h>
 
 #pragma once
 
 struct Channel;
 
-typedef struct {
-  bool initialized;
-  map_void_t channels;
-} ThreadState;
-
 typedef struct Thread {
   Ref ref;
   thrd_t handle;