diff --git a/source/gl_rmisc.c b/source/gl_rmisc.c
index 35a7695..3ff1649 100644
--- a/source/gl_rmisc.c
+++ b/source/gl_rmisc.c
@@ -29,15 +29,15 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdio.h>
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
 #endif
 
+#include <stdio.h>
+
 #include "cmd.h"
 #include "console.h"
 #include "cvar.h"
diff --git a/source/mathlib.c b/source/mathlib.c
index d1ad81b..756c178 100644
--- a/source/mathlib.c
+++ b/source/mathlib.c
@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
 #endif
+
 #include <math.h>
 
 #include "mathlib.h"
diff --git a/source/mdfour.c b/source/mdfour.c
index 6d6187b..348cb03 100644
--- a/source/mdfour.c
+++ b/source/mdfour.c
@@ -30,12 +30,11 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
 #endif
 
 #include "mdfour.h"
@@ -51,10 +50,11 @@ static struct mdfour *m;
 #define F(X,Y,Z) (((X)&(Y)) | ((~(X))&(Z)))
 #define G(X,Y,Z) (((X)&(Y)) | ((X)&(Z)) | ((Y)&(Z)))
 #define H(X,Y,Z) ((X)^(Y)^(Z))
+
 #ifdef LARGE_INT32
-#define lshift(x,s) ((((x)<<(s))&0xFFFFFFFF) | (((x)>>(32-(s)))&0xFFFFFFFF))
+# define lshift(x,s) ((((x)<<(s))&0xFFFFFFFF) | (((x)>>(32-(s)))&0xFFFFFFFF))
 #else
-#define lshift(x,s) (((x)<<(s)) | ((x)>>(32-(s))))
+# define lshift(x,s) (((x)<<(s)) | ((x)>>(32-(s))))
 #endif
 
 #define ROUND1(a,b,c,d,k,s) a = lshift(a + F(b,c,d) + X[k], s)
diff --git a/source/model.c b/source/model.c
index c1c51fb..565fc99 100644
--- a/source/model.c
+++ b/source/model.c
@@ -32,12 +32,11 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
 #endif
 
 #include "cvar.h"
diff --git a/source/model_alias.c b/source/model_alias.c
index dabe225..a855a4d 100644
--- a/source/model_alias.c
+++ b/source/model_alias.c
@@ -32,12 +32,11 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
 #endif
 
 #include "cl_main.h"
diff --git a/source/r_light.c b/source/r_light.c
index a16fd21..ff20e50 100644
--- a/source/r_light.c
+++ b/source/r_light.c
@@ -186,7 +186,7 @@ RecursiveLightPoint (mnode_t *node, vec3_t start, vec3_t end)
 		return r;						// hit something
 
 	if ((back < 0) == side)
-		return -1;						// didn't hit anuthing
+		return -1;						// didn't hit anything
 
 // check for impact on this node
 
diff --git a/source/r_main.c b/source/r_main.c
index 139b6df..b1f2b86 100644
--- a/source/r_main.c
+++ b/source/r_main.c
@@ -29,15 +29,15 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <math.h>
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
 #endif
 
+#include <math.h>
+
 #include "bothdefs.h"
 #include "cl_cam.h"
 #include "cl_main.h"
@@ -725,7 +725,7 @@ R_DrawViewModel (void)
 	j = R_LightPoint (currententity->origin);
 
 	if (j < 24)
-		j = 24;							// allways give some light on gun
+		j = 24;							// always give some light on gun
 	r_viewlighting.ambientlight = j;
 	r_viewlighting.shadelight = j;
 
@@ -1156,8 +1156,7 @@ R_InitTurb (void)
 
 	for (i = 0; i < 1280; i++) {
 		sintable[i] = AMP + sin (i * 3.14159 * 2 / CYCLE) * AMP;
-		intsintable[i] = AMP2 + sin (i * 3.14159 * 2 / CYCLE) * AMP2;	// AMP2, 
-																		// not 
-																		// 20
+		intsintable[i] = AMP2 + sin (i * 3.14159 * 2 / CYCLE) * AMP2;
+		// AMP2 not 20
 	}
 }
diff --git a/source/skin.c b/source/skin.c
index f9808b1..900ead5 100644
--- a/source/skin.c
+++ b/source/skin.c
@@ -29,12 +29,11 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
 #endif
 
 #include "cl_parse.h"
diff --git a/source/wad.c b/source/wad.c
index 80e7c96..6f5cd09 100644
--- a/source/wad.c
+++ b/source/wad.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
diff --git a/source/world.c b/source/world.c
index 9c7c4b1..8075ba6 100644
--- a/source/world.c
+++ b/source/world.c
@@ -59,7 +59,7 @@ typedef struct {
 										// entire move
 	float      *mins, *maxs;			// size of the moving object
 	vec3_t      mins2, maxs2;			// size when clipping against
-										// mosnters
+										// monsters
 	float      *start, *end;
 	trace_t     trace;
 	int         type;
@@ -452,7 +452,7 @@ SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
 	else
 		InsertLinkBefore (&ent->area, &node->solid_edicts);
 
-// if touch_triggers, touch all entities at this node and decend for more
+// if touch_triggers, touch all entities at this node and descend for more
 	if (touch_triggers)
 		SV_TouchLinks (ent, sv_areanodes);
 }