diff --git a/libs/models/alias/sw32_model_alias.c b/libs/models/alias/sw32_model_alias.c
index bfcc38b6c..f4e76f023 100644
--- a/libs/models/alias/sw32_model_alias.c
+++ b/libs/models/alias/sw32_model_alias.c
@@ -43,15 +43,13 @@
 #include "QF/qendian.h"
 #include "QF/sys.h"
 
-//#include "checksum.h"
 #include "d_iface.h"
-//#include "server.h" // DESPAIR
 
 extern char loadname[];
 extern model_t *loadmodel;
 
 /*
-	ALIAS MODELS
+  ALIAS MODELS
 */
 
 extern aliashdr_t *pheader;
diff --git a/libs/video/renderer/sw32/d_edge.c b/libs/video/renderer/sw32/d_edge.c
index 3d7d1fd7f..289bff811 100644
--- a/libs/video/renderer/sw32/d_edge.c
+++ b/libs/video/renderer/sw32/d_edge.c
@@ -36,7 +36,6 @@
 
 #include "d_local.h"
 #include "r_local.h"
-//#include "vid.h"  // DESPAIR
 
 static int	miplevel;
 
diff --git a/libs/video/renderer/sw32/d_fill.c b/libs/video/renderer/sw32/d_fill.c
index ef07da385..8fd4b4039 100644
--- a/libs/video/renderer/sw32/d_fill.c
+++ b/libs/video/renderer/sw32/d_fill.c
@@ -33,7 +33,6 @@
 #include "QF/sys.h"
 
 #include "d_iface.h"
-// #include "vid.h" DESPAIR
 
 
 void
diff --git a/libs/video/renderer/sw32/d_modech.c b/libs/video/renderer/sw32/d_modech.c
index f43d9e893..bd7311495 100644
--- a/libs/video/renderer/sw32/d_modech.c
+++ b/libs/video/renderer/sw32/d_modech.c
@@ -31,7 +31,6 @@
 #endif
 
 #include "QF/render.h"
-// #include "QF/sys.h" // DESPAIR 
 
 #include "d_local.h"
 
diff --git a/libs/video/renderer/sw32/d_part.c b/libs/video/renderer/sw32/d_part.c
index 2d971bf1d..cd656dd34 100644
--- a/libs/video/renderer/sw32/d_part.c
+++ b/libs/video/renderer/sw32/d_part.c
@@ -34,7 +34,6 @@
 
 #include "d_local.h"
 #include "r_local.h"
-// #include "vid.h" // DESPAIR
 
 
 void
diff --git a/libs/video/renderer/sw32/d_polyse.c b/libs/video/renderer/sw32/d_polyse.c
index 90ce300c4..78a4ad89d 100644
--- a/libs/video/renderer/sw32/d_polyse.c
+++ b/libs/video/renderer/sw32/d_polyse.c
@@ -31,12 +31,10 @@
 # include "config.h"
 #endif
 
-//#include "QF/render.h"
 #include "QF/sys.h"
 
 #include "r_local.h"
 #include "d_local.h"
-//#include "vid.h" // DESPAIR
 
 // TODO: put in span spilling to shrink list size
 // !!! if this is changed, it must be changed in d_polysa.s too !!!
diff --git a/libs/video/renderer/sw32/d_scan.c b/libs/video/renderer/sw32/d_scan.c
index 2e6d43fbf..d394eeba0 100644
--- a/libs/video/renderer/sw32/d_scan.c
+++ b/libs/video/renderer/sw32/d_scan.c
@@ -37,7 +37,6 @@
 #include "compat.h"
 #include "d_local.h"
 #include "r_local.h"
-//#include "vid.h" // DESPAIR
 
 byte       *r_turb_pbase;
 void       *r_turb_pdest;
@@ -47,7 +46,7 @@ int         r_turb_spancount;
 
 void        D_DrawTurbulentSpan (void);
 
-extern float *d_zitable; // DESPAIR
+extern float *d_zitable;
 
 
 /*
@@ -857,7 +856,7 @@ D_DrawZSpans (espan_t *pspan)
 		// big-endian (results in swapped depth pairs), and is tuned more for
 		// x86, PowerPC compilers can probably do a good job with raw loop
 		// unrolling if it is even necessary...
-		if (bigendien) // DESPAIR: was bigendian. this correct?
+		if (bigendien)
 		{
 			do
 			{
diff --git a/libs/video/renderer/sw32/d_sky.c b/libs/video/renderer/sw32/d_sky.c
index a0d872c97..0ebbd1c89 100644
--- a/libs/video/renderer/sw32/d_sky.c
+++ b/libs/video/renderer/sw32/d_sky.c
@@ -35,7 +35,6 @@
 
 #include "d_local.h"
 #include "r_local.h"
-// #include "vid.h" // DESPAIR
 
 #define SKY_SPAN_SHIFT	5
 #define SKY_SPAN_MAX	(1 << SKY_SPAN_SHIFT)
diff --git a/libs/video/renderer/sw32/d_sprite.c b/libs/video/renderer/sw32/d_sprite.c
index 3e6f179da..b3884d43f 100644
--- a/libs/video/renderer/sw32/d_sprite.c
+++ b/libs/video/renderer/sw32/d_sprite.c
@@ -34,13 +34,12 @@
 #include "QF/sys.h"
 
 #include "d_local.h"
-// #include "vid.h" // DESPAIR
 
 static int  sprite_height;
 static int  minindex, maxindex;
 static sspan_t *sprite_spans;
 
-extern float *d_zitable; // DESPAIR
+extern float *d_zitable;
 
 
 void
diff --git a/libs/video/renderer/sw32/d_zpoint.c b/libs/video/renderer/sw32/d_zpoint.c
index ad489f4bd..3f1f1e404 100644
--- a/libs/video/renderer/sw32/d_zpoint.c
+++ b/libs/video/renderer/sw32/d_zpoint.c
@@ -33,7 +33,6 @@
 #include "QF/sys.h"
 
 #include "d_local.h"
-// #include "vid.h" // DESPAIR
 
 
 void
diff --git a/libs/video/renderer/sw32/draw.c b/libs/video/renderer/sw32/draw.c
index 7b83a68a2..e5d73fbbf 100644
--- a/libs/video/renderer/sw32/draw.c
+++ b/libs/video/renderer/sw32/draw.c
@@ -43,12 +43,7 @@
 #include "QF/sys.h"
 #include "QF/vfs.h" 
 
-//#include "client.h" DESPAIR
-//#include "quakefs.h"
-//#include "vid.h"
-
 #include "d_iface.h"
-//#include "r_cvar.h"
 
 typedef struct {
 	vrect_t     rect;
diff --git a/libs/video/renderer/sw32/screen.c b/libs/video/renderer/sw32/screen.c
index 86a1f8b94..d75800080 100644
--- a/libs/video/renderer/sw32/screen.c
+++ b/libs/video/renderer/sw32/screen.c
@@ -43,7 +43,6 @@
 #include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/keys.h"
-//#include "QF/menu.h"
 #include "QF/pcx.h"
 #include "QF/render.h" 
 #include "QF/screen.h" 
@@ -52,14 +51,11 @@
 #include "QF/vfs.h"
 #include "QF/vid.h"
 
-//#include "cl_parse.h" DESPAIR
-//#include "client.h"
 #include "compat.h"
 #include "d_iface.h"
 #include "r_cvar.h"
 #include "r_local.h"
 #include "sbar.h"
-//#include "skin.h"
 #include "view.h"
 
 /*
@@ -371,14 +367,6 @@ SCR_ApplyBlend (void)
 	byte	   *basepal, *newpal;
 	byte		pal[768];
 
-/* DESPAIR
-	qboolean	force, new;
-
-	force = V_CheckGamma ();
-	if (!new && !force && r_pixbytes == 1)
-		return;
-*/
-
 	switch(r_pixbytes) {
 	case 1:
 	{
@@ -501,7 +489,7 @@ SCR_Init (void)
 	Cmd_AddCommand ("screenshot", SCR_ScreenShot_f, "Take a screenshot and "
 					"write it as qfxxx.tga in the current directory");
 	Cmd_AddCommand ("snap", SCR_RSShot_f, "Take a screenshot and upload it "
-					"to the server"); // DESPAIR
+					"to the server");
 	Cmd_AddCommand ("sizeup", SCR_SizeUp_f, "Increase the size of the screen");
 	Cmd_AddCommand ("sizedown", SCR_SizeDown_f, "Decrease the size of the "
 					"screen");
@@ -545,20 +533,6 @@ SCR_DrawTurtle (int swap)
 	Draw_Pic (scr_vrect.x, scr_vrect.y, scr_turtle);
 }
 
-/* DESPAIR
-void
-SCR_DrawNet (void)
-{
-	if (cls.netchan.outgoing_sequence - cls.netchan.incoming_acknowledged <
-		UPDATE_BACKUP - 1)
-		return;
-	if (cls.demoplayback)
-		return;
-
-	Draw_Pic (scr_vrect.x + 64, scr_vrect.y, scr_net);
-}
-*/
-
 extern cvar_t *show_fps;
 extern cvar_t *show_time;