diff --git a/code/sys/sys_win32.c b/code/sys/sys_win32.c
index ce1b4335..df0d474c 100644
--- a/code/sys/sys_win32.c
+++ b/code/sys/sys_win32.c
@@ -343,7 +343,7 @@ void Sys_ListFilteredFiles( const char *basedir, char *subdirs, char *filter, ch
 {
 	char		search[MAX_OSPATH], newsubdirs[MAX_OSPATH];
 	char		filename[MAX_OSPATH];
-	int			findhandle;
+	intptr_t	findhandle;
 	struct _finddata_t findinfo;
 
 	if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
@@ -426,7 +426,7 @@ char **Sys_ListFiles( const char *directory, const char *extension, char *filter
 	char		**listCopy;
 	char		*list[MAX_FOUND_FILES];
 	struct _finddata_t findinfo;
-	int			findhandle;
+	intptr_t		findhandle;
 	int			flag;
 	int			i;
 
diff --git a/code/tools/asm/cmdlib.c b/code/tools/asm/cmdlib.c
index f7171eea..d130d8df 100644
--- a/code/tools/asm/cmdlib.c
+++ b/code/tools/asm/cmdlib.c
@@ -63,7 +63,7 @@ char	*ex_argv[MAX_EX_ARGC];
 void ExpandWildcards( int *argc, char ***argv )
 {
 	struct _finddata_t fileinfo;
-	int		handle;
+	intptr_t	handle;
 	int		i;
 	char	filename[1024];
 	char	filebase[1024];