diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 899f1c86..d0bac3d5 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -196,4 +196,4 @@ void D_SetPassword(const char *pw);
 // used for the player setup menu
 UINT8 CanChangeSkin(INT32 playernum);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index d9e65523..64df1a2e 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -1069,7 +1069,7 @@ static float HWR_ClipViewSegment(INT32 x, polyvertex_t *v1, polyvertex_t *v2)
 //
 // HWR_SplitWall
 //
-static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum, FSurfaceInfo* Surf, UINT32 cutflag, ffloor_t *pfloor)
+static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum, FSurfaceInfo* Surf, INT32 cutflag, ffloor_t *pfloor)
 {
 	/* SoM: split up and light walls according to the
 	 lightlist. This may also include leaving out parts
diff --git a/src/i_sound.h b/src/i_sound.h
index 2f73017d..bc9829fd 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -265,4 +265,4 @@ void I_PlayCD(UINT8 track, UINT8 looping);
 */
 boolean I_SetVolumeCD(INT32 volume);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 609d7dec..a3c42199 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -860,4 +860,4 @@ boolean I_SetSongTrack(int track)
 	return false;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/win32/win_dll.c b/src/win32/win_dll.c
index c9b3fba4..71eda043 100644
--- a/src/win32/win_dll.c
+++ b/src/win32/win_dll.c
@@ -148,7 +148,7 @@ static loadfunc_t hwdFuncTable[] = {
 #ifdef SHUFFLE
 	{"PostImgRedraw",       &hwdriver.pfnPostImgRedraw},
 #endif
-	{"FlushScreenTextures"},&hwdriver.pfnFlushScreenTextures},
+	{"FlushScreenTextures", &hwdriver.pfnFlushScreenTextures},
 	{"StartScreenWipe",     &hwdriver.pfnStartScreenWipe},
 	{"EndScreenWipe",       &hwdriver.pfnEndScreenWipe},
 	{"DoScreenWipe",        &hwdriver.pfnDoScreenWipe},
diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index 34a6a929..454c53e3 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -457,6 +457,8 @@ void I_ShutdownMusic(void)
 
 musictype_t I_SongType(void)
 {
+	FMOD_SOUND_TYPE type;
+
 #ifdef HAVE_LIBGME
 	if (gme)
 		return MU_GME;
@@ -465,7 +467,6 @@ musictype_t I_SongType(void)
 	if (!music_stream)
 		return MU_NONE;
 
-	FMOD_SOUND_TYPE type;
 	if (FMOD_Sound_GetFormat(music_stream, &type, NULL, NULL, NULL) == FMOD_OK)
 	{
 		switch(type)