diff --git a/src/server/sv_init.c b/src/server/sv_init.c
index 98db7c69..0a628f25 100644
--- a/src/server/sv_init.c
+++ b/src/server/sv_init.c
@@ -194,7 +194,7 @@ SV_SpawnServer(char *server, char *spawnpoint, server_state_t serverstate,
 
 	if (sv.demofile)
 	{
-		FS_FCloseFile((fileHandle_t)sv.demofile);
+		FS_FCloseFile(sv.demofile);
 	}
 
 	svs.spawncount++; /* any partially connected client will be restarted */
diff --git a/src/server/sv_main.c b/src/server/sv_main.c
index de0c6fda..6b0d0b32 100644
--- a/src/server/sv_main.c
+++ b/src/server/sv_main.c
@@ -681,7 +681,7 @@ SV_Shutdown(char *finalmsg, qboolean reconnect)
 	/* free current level */
 	if (sv.demofile)
 	{
-		FS_FCloseFile((fileHandle_t)sv.demofile);
+		FS_FCloseFile(sv.demofile);
 	}
 
 	memset(&sv, 0, sizeof(sv));
diff --git a/src/server/sv_send.c b/src/server/sv_send.c
index 75315fa4..688e4ee8 100644
--- a/src/server/sv_send.c
+++ b/src/server/sv_send.c
@@ -466,7 +466,7 @@ SV_DemoCompleted(void)
 {
 	if (sv.demofile)
 	{
-		FS_FCloseFile((fileHandle_t)sv.demofile);
+		FS_FCloseFile(sv.demofile);
 		sv.demofile = 0;
 	}
 
@@ -527,7 +527,7 @@ SV_SendClientMessages(void)
 		else
 		{
 			/* get the next message */
-			r = FS_FRead(&msglen, 4, 1, (fileHandle_t)sv.demofile);
+			r = FS_FRead(&msglen, 4, 1, sv.demofile);
 
 			if (r != 4)
 			{
@@ -549,7 +549,7 @@ SV_SendClientMessages(void)
 						"SV_SendClientMessages: msglen > MAX_MSGLEN");
 			}
 
-			r = FS_FRead(msgbuf, msglen, 1, (fileHandle_t)sv.demofile);
+			r = FS_FRead(msgbuf, msglen, 1, sv.demofile);
 
 			if (r != msglen)
 			{
diff --git a/src/server/sv_user.c b/src/server/sv_user.c
index 7d30ae1e..45cc6a94 100644
--- a/src/server/sv_user.c
+++ b/src/server/sv_user.c
@@ -36,7 +36,7 @@ SV_BeginDemoserver(void)
 	char name[MAX_OSPATH];
 
 	Com_sprintf(name, sizeof(name), "demos/%s", sv.name);
-	FS_FOpenFile(name, (fileHandle_t *)&sv.demofile, FS_READ);
+	FS_FOpenFile(name, &sv.demofile, FS_READ);
 
 	if (!sv.demofile)
 	{