diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 6080b2fd0..f2e168616 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -878,7 +878,7 @@ void D_RegisterClientCommands(void)
 //	CV_RegisterVar(&cv_snapto);
 
 	CV_RegisterVar(&cv_freedemocamera);
-	
+
 	// add cheat commands
 	COM_AddCommand("noclip", Command_CheatNoClip_f);
 	COM_AddCommand("god", Command_CheatGod_f);
diff --git a/src/hardware/hw_batching.h b/src/hardware/hw_batching.h
index 3d22324ac..42291a0df 100644
--- a/src/hardware/hw_batching.h
+++ b/src/hardware/hw_batching.h
@@ -16,7 +16,7 @@
 #include "hw_data.h"
 #include "hw_drv.h"
 
-typedef struct 
+typedef struct
 {
 	FSurfaceInfo surf;// surf also has its own polyflags for some reason, but it seems unused
 	unsigned int vertsIndex;// location of verts in unsortedVertexArray
diff --git a/src/lua_skinlib.c b/src/lua_skinlib.c
index ea368a9cd..56be6bf4f 100644
--- a/src/lua_skinlib.c
+++ b/src/lua_skinlib.c
@@ -214,7 +214,7 @@ static int skin_get(lua_State *L)
 		break;
 	case skin_sprites:
 		LUA_PushLightUserdata(L, skin->sprites, META_SKINSPRITES);
-		break;	
+		break;
 	}
 	return 1;
 }
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 63a14636d..7f322567e 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -4060,7 +4060,7 @@ bossjustdie:
 			// Initialize my junk
 			junk.tags.tags = NULL;
 			junk.tags.count = 0;
-			
+
 			Tag_FSet(&junk.tags, LE_KOOPA);
 			EV_DoCeiling(&junk, raiseToHighest);
 			return;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 1f87762bc..a1edcfe77 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11398,7 +11398,7 @@ void P_SpawnPlayer(INT32 playernum)
 		p->normalspeed = skins[p->skin].normalspeed;
 		p->jumpfactor = skins[p->skin].jumpfactor;
 	}
-	
+
 	// Clear lastlinehit and lastsidehit
 	p->lastsidehit = -1;
 	p->lastlinehit = -1;
diff --git a/src/p_user.c b/src/p_user.c
index 892f4b678..2377134cc 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2613,10 +2613,10 @@ static void P_CheckBustableBlocks(player_t *player)
 
 	if ((netgame || multiplayer) && player->spectator)
 		return;
-	
+
 	oldx = player->mo->x;
 	oldy = player->mo->y;
-	
+
 	if (!(player->pflags & PF_BOUNCING)) // Bouncers only get to break downwards, not sideways
 	{
 		P_UnsetThingPosition(player->mo);
@@ -2635,7 +2635,7 @@ static void P_CheckBustableBlocks(player_t *player)
 
 		if (!node->m_sector->ffloors)
 			continue;
-		
+
 		for (rover = node->m_sector->ffloors; rover; rover = rover->next)
 		{
 			if (!P_PlayerCanBust(player, rover))
@@ -4525,7 +4525,7 @@ void P_DoJump(player_t *player, boolean soundandstate)
 	player->mo->eflags &= ~MFE_APPLYPMOMZ;
 
 	player->pflags |= P_GetJumpFlags(player);;
-	
+
 	if (player->charflags & SF_NOJUMPDAMAGE)
 		player->pflags &= ~PF_SPINNING;
 
diff --git a/src/w_wad.c b/src/w_wad.c
index 2429eaf92..4aae2ee46 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -2144,7 +2144,7 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error)
 		{"LT", 2}, // Titlecard changes
 
 		{"SLID", 4}, // Continue
-		{"CONT", 4}, 
+		{"CONT", 4},
 
 		{"MINICAPS", 8}, // NiGHTS graphics here and below
 		{"BLUESTAT", 8}, // Sphere status