diff --git a/filesystem/VFileSystem009.cpp b/filesystem/VFileSystem009.cpp
index ad2a72c0..ffcffe40 100644
--- a/filesystem/VFileSystem009.cpp
+++ b/filesystem/VFileSystem009.cpp
@@ -476,10 +476,10 @@ public:
 	int ResumeResourcePreloading() override { return 0; }
 	bool IsAppReadyForOfflinePlay(int) override { return true; }
 	bool IsFileImmediatelyAvailable(const char *) override { return true; }
-	bool GetWaitForResourcesProgress(WaitForResourcesHandle_t, float *progress, bool *override) override
+	bool GetWaitForResourcesProgress(WaitForResourcesHandle_t, float *pProgress, bool *pOverride) override
 	{
-		if( progress ) *progress = 0;
-		if( override ) *override = true;
+		if( pProgress ) *pProgress = 0;
+		if( pOverride ) *pOverride = true;
 		return false;
 	}
 } g_VFileSystem009;
diff --git a/filesystem/filesystem_internal.h b/filesystem/filesystem_internal.h
index b70cb77f..3cf5a462 100644
--- a/filesystem/filesystem_internal.h
+++ b/filesystem/filesystem_internal.h
@@ -28,7 +28,6 @@ typedef struct zip_s zip_t;
 typedef struct pack_s pack_t;
 typedef struct wfile_s wfile_t;
 
-
 #define FILE_BUFF_SIZE		(2048)
 
 struct file_s
diff --git a/filesystem/pak.c b/filesystem/pak.c
index c0a8a911..1cc0037a 100644
--- a/filesystem/pak.c
+++ b/filesystem/pak.c
@@ -63,14 +63,14 @@ typedef struct
 #define PAK_LOAD_NO_FILES		5
 #define PAK_LOAD_CORRUPTED		6
 
-typedef struct pack_s
+struct pack_s
 {
 	string		filename;
 	int		handle;
 	int		numfiles;
 	time_t		filetime;			// common for all packed files
 	dpackfile_t	*files;
-} pack_t;
+};
 
 /*
 ====================
diff --git a/filesystem/wad.c b/filesystem/wad.c
index f741ff68..646476d3 100644
--- a/filesystem/wad.c
+++ b/filesystem/wad.c
@@ -69,7 +69,7 @@ typedef struct
 	char		name[WAD3_NAMELEN];	// must be null terminated
 } dlumpinfo_t;
 
-typedef struct wfile_s
+struct wfile_s
 {
 	string		filename;
 	int		infotableofs;
@@ -78,7 +78,7 @@ typedef struct wfile_s
 	file_t		*handle;
 	dlumpinfo_t	*lumps;
 	time_t		filetime;
-} wfile_t;
+};
 
 // WAD errors
 #define WAD_LOAD_OK			0
diff --git a/filesystem/zip.c b/filesystem/zip.c
index 838928e0..829d1553 100644
--- a/filesystem/zip.c
+++ b/filesystem/zip.c
@@ -118,14 +118,14 @@ typedef struct zipfile_s
 	unsigned short flags;
 } zipfile_t;
 
-typedef struct zip_s
+struct zip_s
 {
 	string		filename;
 	int		handle;
 	int		numfiles;
 	time_t		filetime;
 	zipfile_t	*files;
-} zip_t;
+};
 
 #ifdef XASH_REDUCE_FD
 static void FS_EnsureOpenZip( zip_t *zip )