diff --git a/flashrom.c b/flashrom.c
index 19afb5446..b6e5cf85a 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -21,6 +21,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <string.h>
 #include <unistd.h>
@@ -48,7 +49,7 @@ static const struct programmer_entry *programmer = NULL;
 struct decode_sizes max_rom_decode;
 
 /* If nonzero, used as the start address of bottom-aligned flash. */
-unsigned long flashbase;
+uintptr_t flashbase;
 
 /* Is writing allowed with this programmer? */
 bool programmer_may_write;
diff --git a/include/programmer.h b/include/programmer.h
index 5b304f55c..562f58ad2 100644
--- a/include/programmer.h
+++ b/include/programmer.h
@@ -292,7 +292,7 @@ struct decode_sizes {
 // FIXME: These need to be local, not global
 extern struct decode_sizes max_rom_decode;
 extern bool programmer_may_write;
-extern unsigned long flashbase;
+extern uintptr_t flashbase; /* used in programmer_enable.c */
 char *extract_programmer_param_str(const struct programmer_cfg *cfg, const char *param_name);
 
 /* spi.c */