diff --git a/rehlds/engine/server.h b/rehlds/engine/server.h
index c59332e..cbf31e8 100644
--- a/rehlds/engine/server.h
+++ b/rehlds/engine/server.h
@@ -95,13 +95,6 @@ typedef enum redirect_e
 	RD_PACKET = 2,
 } redirect_t;
 
-typedef enum server_state_e
-{
-	ss_dead = 0,
-	ss_loading = 1,
-	ss_active = 2,
-} server_state_t;
-
 typedef struct server_s
 {
 	qboolean active;
diff --git a/rehlds/public/rehlds/maintypes.h b/rehlds/public/rehlds/maintypes.h
index b211e2d..158a354 100644
--- a/rehlds/public/rehlds/maintypes.h
+++ b/rehlds/public/rehlds/maintypes.h
@@ -67,4 +67,12 @@ typedef enum sv_delta_s
 	sv_packet_delta,
 } sv_delta_t;
 
+// From engine/server.h
+typedef enum server_state_e
+{
+	ss_dead = 0,
+	ss_loading = 1,
+	ss_active = 2,
+} server_state_t;
+
 #endif // MAINTYPES_H
diff --git a/rehlds/public/rehlds/rehlds_interfaces.h b/rehlds/public/rehlds/rehlds_interfaces.h
index da3768c..438838c 100644
--- a/rehlds/public/rehlds/rehlds_interfaces.h
+++ b/rehlds/public/rehlds/rehlds_interfaces.h
@@ -36,6 +36,7 @@ class IGameClient;
 
 #include "common_rehlds.h"
 #include "userid_rehlds.h"
+#include "FileSystem.h"
 
 #ifdef REHLDS_SELF
 #include "server.h"