diff --git a/src/d_main.c b/src/d_main.c
index 9e368a450..34ad30009 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1303,10 +1303,6 @@ void D_SRB2Main(void)
 			// use user specific config file
 #ifdef DEFAULTDIR
 			snprintf(srb2home, sizeof srb2home, "%s" PATHSEP DEFAULTDIR, userhome);
-#else
-			snprintf(srb2home, sizeof srb2home, "%s", userhome);
-#endif
-
 			if (dedicated)
 				snprintf(configfile, sizeof configfile, "%s" PATHSEP "d"CONFIGFILENAME, srb2home);
 			else
@@ -1319,7 +1315,6 @@ void D_SRB2Main(void)
 			snprintf(luafiledir, sizeof luafiledir, "%s" PATHSEP "luafiles", srb2home);
 #else // DEFAULTDIR
 			snprintf(srb2home, sizeof srb2home, "%s", userhome);
-			snprintf(downloaddir, sizeof downloaddir, "%s", userhome);
 			if (dedicated)
 				snprintf(configfile, sizeof configfile, "%s" PATHSEP "d"CONFIGFILENAME, userhome);
 			else
@@ -1336,6 +1331,7 @@ void D_SRB2Main(void)
 		configfile[sizeof configfile - 1] = '\0';
 	}
 
+
 	// Create addons dir
 	snprintf(addonsdir, sizeof addonsdir, "%s%s%s", srb2home, PATHSEP, "addons");
 	I_mkdir(addonsdir, 0755);
diff --git a/src/dehacked.c b/src/dehacked.c
index 0d5c12fbe..4cf3c3bbc 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -11636,7 +11636,6 @@ struct {
 	{"KSHIELD_FLAME",KSHIELD_FLAME},
 	{"NUMKARTSHIELDS",NUMKARTSHIELDS},
 
-#endif
 	{NULL,0}
 };
 
@@ -12133,7 +12132,6 @@ void DEH_Check(void)
 
 	if (dehcolors != SKINCOLOR_FIRSTFREESLOT)
 		I_Error("You forgot to update the Dehacked colors list, you dolt!\n(%d colors defined, versus %s in the Dehacked list)\n", SKINCOLOR_FIRSTFREESLOT, sizeu1(dehcolors));
-#endif
 }
 
 #include "lua_script.h"
diff --git a/src/g_demo.c b/src/g_demo.c
index 029608a6f..df578be72 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -2726,7 +2726,6 @@ void G_DoPlayDemo(char *defdemoname)
 	{
 	case DEMOVERSION: // latest always supported
 		break;
-#endif
 	// too old, cannot support.
 	default:
 		snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);