diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 64a61d701..0eedd4542 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -613,6 +613,10 @@ void D_RegisterServerCommands(void)
 
 	CV_RegisterVar(&cv_allowseenames);
 
+	// Other filesrch.c consvars are defined in D_RegisterClientCommands
+	CV_RegisterVar(&cv_addons_option);
+	CV_RegisterVar(&cv_addons_folder);
+
 	CV_RegisterVar(&cv_dummyconsvar);
 }
 
@@ -795,7 +799,7 @@ void D_RegisterClientCommands(void)
 
 	// filesrch.c
 	//CV_RegisterVar(&cv_addons_option); // These two are now defined
-	//CV_RegisterVar(&cv_addons_folder); // in R_RegisterEngineStuff
+	//CV_RegisterVar(&cv_addons_folder); // in D_RegisterServerCommands
 	CV_RegisterVar(&cv_addons_md5);
 	CV_RegisterVar(&cv_addons_showall);
 	CV_RegisterVar(&cv_addons_search_type);
diff --git a/src/r_main.c b/src/r_main.c
index 2a31227d1..ebf7a28bf 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -36,7 +36,6 @@
 #include "r_main.h"
 #include "i_system.h" // I_GetPreciseTime
 #include "r_fps.h" // Frame interpolation/uncapped
-#include "filesrch.c" // cv_addons_folder
 
 #ifdef HWRENDER
 #include "hardware/hw_main.h"
@@ -1590,10 +1589,6 @@ void R_RegisterEngineStuff(void)
 	CV_RegisterVar(&cv_flipcam);
 	CV_RegisterVar(&cv_flipcam2);
 
-	// Other filesrch.c consvars are defined in D_RegisterClientCommands
-	CV_RegisterVar(&cv_addons_option);
-	CV_RegisterVar(&cv_addons_folder);
-
 	// Enough for dedicated server
 	if (dedicated)
 		return;