--- a/src/command.c
+++ b/src/command.c
@@ -606,7 +606,7 @@
 void do_help (void)
 {	char name[256];
 	header *hd;
-	int count,i,defaults;
+	size_t count,i,defaults;
 	char *p,*end,*pnote;
 	builtintyp *b;
 	scan_space();
--- a/src/stack.h
+++ b/src/stack.h
@@ -63,7 +63,7 @@
 #endif
 } dims;
 
-typedef struct { unsigned long s; } inttyp;
+typedef struct { size_t s; } inttyp;
 
 typedef struct { header hd; double val; } realtyp;
 
--- a/src/udf.c
+++ b/src/udf.c
@@ -334,7 +334,7 @@
 {	char name[16];
 	header *hd;
 	char *p,*pnote;
-	int i,count,defaults;
+	size_t i,count,defaults;
 	builtintyp *b;
 	scan_space();
 	scan_name(name); hd=searchudf(name);