diff --git a/app/sheet/sheet_internal.h b/app/sheet/sheet_internal.h
index f250eb80..39ef3a90 100644
--- a/app/sheet/sheet_internal.h
+++ b/app/sheet/sheet_internal.h
@@ -28,6 +28,9 @@ struct zsvsheet_display_dimensions {
   size_t footer_span;
 };
 
+// Forward declaration of zsv_index
+struct zsv_index;
+
 struct zsvsheet_buffer_info_internal {
   struct zsvsheet_ui_flags flags;
   struct zsv_index *index;
diff --git a/app/sheet/ui_buffer.h b/app/sheet/ui_buffer.h
index 816ee8a5..b413af00 100644
--- a/app/sheet/ui_buffer.h
+++ b/app/sheet/ui_buffer.h
@@ -38,12 +38,12 @@ struct zsvsheet_ui_flags {
   volatile atomic_uchar flags[2]; // Using 2 bytes to accommodate all bits
 };
 
+#include "sheet_internal.h"
+
 // Buffer structure forward declaration
 struct zsvsheet_ui_buffer;
 typedef struct zsvsheet_ui_buffer *zsvsheet_ui_buffer_t;
 
-#include "sheet_internal.h"
-
 // Row/column position structure
 struct zsvsheet_rowcol {
   size_t row;