diff --git a/fmap.c b/fmap.c
index 7793be7..eafe80c 100644
--- a/fmap.c
+++ b/fmap.c
@@ -91,15 +91,15 @@
  *         -1 to indicate that fmap was not found
  *         -2 to indicate fmap is truncated or exceeds buffer + len
  */
-static off_t fmap_lsearch(const uint8_t *buf, size_t len)
+static ssize_t fmap_lsearch(const uint8_t *buf, size_t len)
 {
-	off_t offset;
+	ssize_t offset;
 	bool fmap_found = 0;
 
 	if (len < sizeof(struct fmap))
 		return -1;
 
-	for (offset = 0; offset <= (off_t)(len - sizeof(struct fmap)); offset++) {
+	for (offset = 0; offset <= (ssize_t)(len - sizeof(struct fmap)); offset++) {
 		if (is_valid_fmap((struct fmap *)&buf[offset])) {
 			fmap_found = 1;
 			break;
@@ -131,7 +131,7 @@
  */
 int fmap_read_from_buffer(struct fmap **fmap_out, const uint8_t *const buf, size_t len)
 {
-	off_t offset = fmap_lsearch(buf, len);
+	ssize_t offset = fmap_lsearch(buf, len);
 	if (offset < 0) {
 		msg_gdbg("Unable to find fmap in provided buffer.\n");
 		return 2;
diff --git a/libflashrom.c b/libflashrom.c
index 19a41cf..c336b8c 100644
--- a/libflashrom.c
+++ b/libflashrom.c
@@ -421,7 +421,7 @@
  *         1 on any other error.
  */
 int flashrom_layout_read_fmap_from_rom(struct flashrom_layout **const layout,
-		struct flashctx *const flashctx, off_t offset, size_t len)
+		struct flashctx *const flashctx, size_t offset, size_t len)
 {
 #ifndef __FLASHROM_LITTLE_ENDIAN__
 	return 3;
diff --git a/libflashrom.h b/libflashrom.h
index 972e7d1..603dccf 100644
--- a/libflashrom.h
+++ b/libflashrom.h
@@ -68,7 +68,7 @@
 struct flashrom_layout;
 int flashrom_layout_read_from_ifd(struct flashrom_layout **, struct flashrom_flashctx *, const void *dump, size_t len);
 int flashrom_layout_read_fmap_from_rom(struct flashrom_layout **,
-		struct flashrom_flashctx *, off_t offset, size_t length);
+		struct flashrom_flashctx *, size_t offset, size_t length);
 int flashrom_layout_read_fmap_from_buffer(struct flashrom_layout **layout,
 		struct flashrom_flashctx *, const uint8_t *buf, size_t len);
 int flashrom_layout_include_region(struct flashrom_layout *, const char *name);