diff --git a/layout.c b/layout.c
index f7f68b3..36fa0b6 100644
--- a/layout.c
+++ b/layout.c
@@ -32,12 +32,17 @@
 	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 9df1beb..6bd3732 100644
--- a/layout.h
+++ b/layout.h
@@ -56,8 +56,9 @@
 	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 process_include_args(struct flashrom_layout *l, const struct layout_include_args *const args);