diff --git a/include/QF/riff.h b/include/QF/riff.h
index 989568383..22ecc36fd 100644
--- a/include/QF/riff.h
+++ b/include/QF/riff.h
@@ -32,44 +32,47 @@
 #ifndef __QF_riff_h
 #define __QF_riff_h
 
+#include <stdint.h>
+#include <sys/types.h>
+
 #include "QF/quakeio.h"
 
 typedef struct riff_d_chunk_s {
 	char        name[4];
-	unsigned    len;
+	uint32_t    len;
 } riff_d_chunk_t;
 
 typedef struct riff_d_cue_point_s {
-	unsigned    name;
-	unsigned    position;
+	uint32_t    name;
+	uint32_t    position;
 	char        chunk[4];
-	unsigned    chunk_start;
-	unsigned    block_start;
-	unsigned    sample_offset;
+	uint32_t    chunk_start;
+	uint32_t    block_start;
+	uint32_t    sample_offset;
 } riff_d_cue_point_t;
 
 typedef struct riff_d_cue_s {
-	unsigned    count;
+	uint32_t    count;
 	riff_d_cue_point_t cue_points[1];
 } riff_d_cue_t;
 
 typedef struct riff_d_format_s {
-	unsigned short format_tag;
-	unsigned short channels;
-	unsigned    samples_per_sec;
-	unsigned    bytes_per_sec;
-	unsigned short align;
-	unsigned short bits_per_sample;	// only if format_tag == 1
+	uint16_t    format_tag;
+	uint16_t    channels;
+	uint32_t    samples_per_sec;
+	uint32_t    bytes_per_sec;
+	uint16_t    align;
+	uint16_t    bits_per_sample;	// only if format_tag == 1
 } riff_d_format_t;
 
 typedef struct riff_d_ltxt_s {
-	unsigned    name;
-	unsigned    len;
+	uint32_t    name;
+	uint32_t    len;
 	char        purpose[4];
-	unsigned    country;
-	unsigned    language;
-	unsigned    dialect;
-	unsigned    codepage;
+	uint32_t    country;
+	uint32_t    language;
+	uint32_t    dialect;
+	uint32_t    codepage;
 	unsigned char data[0];
 } riff_d_ltxt_t;
 
@@ -91,7 +94,7 @@ typedef struct riff_ltxt_s {
 
 typedef struct riff_label_s {
 	riff_d_chunk_t   ck;
-	unsigned    ofs;
+	off_t       ofs;
 	char       *label;
 } riff_label_t;
 
diff --git a/libs/util/riff.c b/libs/util/riff.c
index e6c71aa50..2e5ee7f95 100644
--- a/libs/util/riff.c
+++ b/libs/util/riff.c
@@ -131,11 +131,12 @@ read_ltxt (QFile *f, int len, riff_d_ltxt_t *ltxt)
 static void
 read_adtl (dstring_t *list_buf, QFile *f, int len)
 {
-	riff_d_chunk_t ck, *chunk = 0;
-	riff_ltxt_t *ltxt;
-	riff_label_t *label;
-	riff_data_t *data;
-	riff_list_t *list;
+	riff_d_chunk_t  ck;
+	riff_d_chunk_t  *chunk = 0;
+	riff_ltxt_t     *ltxt;
+	riff_label_t    *label;
+	riff_data_t     *data;
+	riff_list_t     *list;
 
 	list = (riff_list_t *) list_buf->str;
 	while (len) {
@@ -182,7 +183,7 @@ static riff_list_t *
 read_list (riff_d_chunk_t *ck, QFile *f, int len)
 {
 	riff_d_chunk_t  *chunk = 0;
-	dstring_t  *list_buf;
+	dstring_t       *list_buf;
 	riff_list_t     *list;
 
 	list_buf = dstring_new ();
@@ -257,7 +258,7 @@ static riff_d_cue_t *
 read_cue (QFile *f, int len)
 {
 	riff_d_cue_t *cue = malloc (len);
-	unsigned int i;
+	uint32_t    i;
 
 	if (!Rread (f, cue, len)) {
 		free (cue);