diff --git a/src/features/esp.c b/src/features/esp.c
index 4c6e0d2..620e011 100644
--- a/src/features/esp.c
+++ b/src/features/esp.c
@@ -1,11 +1,9 @@
 
-#include "include/esp.h"
+#include "features.h"
 #include "../include/globals.h"
 #include "../include/cvars.h"
 #include "../include/util.h"
 
-/* TODO: Replace src/features/include/X.h -> src/features/features.h */
-
 void esp(void) {
     if (!CVAR_ON(esp))
         return;
diff --git a/src/features/movement.c b/src/features/movement.c
index 95b4b32..aef38bc 100644
--- a/src/features/movement.c
+++ b/src/features/movement.c
@@ -1,7 +1,7 @@
 
 #include <stdio.h>
 
-#include "include/movement.h"
+#include "features.h"
 #include "../include/sdk.h"
 #include "../include/globals.h"
 #include "../include/cvars.h"
diff --git a/src/hooks.c b/src/hooks.c
index bd88fc4..ace9721 100644
--- a/src/hooks.c
+++ b/src/hooks.c
@@ -3,8 +3,8 @@
 #include "include/sdk.h"
 #include "include/globals.h"
 
-#include "features/include/movement.h"
-#include "features/include/esp.h"
+/* bhop(), esp(), etc. */
+#include "features/features.h"
 
 DECL_HOOK(CL_CreateMove);
 DECL_HOOK(HUD_Redraw);