diff --git a/layout.c b/layout.c
index ede476ac4..11df15cf8 100644
--- a/layout.c
+++ b/layout.c
@@ -33,12 +33,17 @@ struct flashrom_layout *get_global_layout(void)
 	return &global_layout;
 }
 
+const struct flashrom_layout *get_default_layout(const struct flashrom_flashctx *const flashctx)
+{
+	return flashctx->default_layout;
+}
+
 const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const flashctx)
 {
 	if (flashctx->layout && flashctx->layout->num_entries)
 		return flashctx->layout;
 	else
-		return flashctx->default_layout;
+		return get_default_layout(flashctx);
 }
 
 static struct romentry *mutable_layout_next(
diff --git a/layout.h b/layout.h
index c05d1e776..49c1a1371 100644
--- a/layout.h
+++ b/layout.h
@@ -58,8 +58,9 @@ struct layout_include_args {
 	struct layout_include_args *next;
 };
 
-struct flashrom_layout *get_global_layout(void);
 struct flashrom_flashctx;
+struct flashrom_layout *get_global_layout(void);
+const struct flashrom_layout *get_default_layout(const struct flashrom_flashctx *);
 const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const flashctx);
 
 int get_region_range(struct flashrom_layout *const l, const char *name,