diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index 45f2a790d..fbb3effe9 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -61,14 +61,8 @@
 #define COFFEE_FD_APPEND	0x4
 #define COFFEE_FD_FREE		0x0
 
-struct file_desc {
-  uint32_t offset;
-  uint32_t end;
-  uint16_t file_page;
-  uint8_t flags;
-  uint16_t max_pages;
-  uint16_t next_log_entry;
-};
+#define COFFEE_PAGE_COUNT	(COFFEE_SIZE / COFFEE_PAGE_SIZE)
+#define COFFEE_PAGES_PER_SECTOR	(COFFEE_SECTOR_SIZE / COFFEE_PAGE_SIZE)
 
 #define COFFEE_FLAG_ALLOCATED	0x1
 #define COFFEE_FLAG_OBSOLETE	0x2
@@ -97,9 +91,18 @@ struct file_desc {
 #define WRITE_HEADER(hdr, page)			\
   COFFEE_WRITE((hdr), sizeof (*hdr), (page) * COFFEE_PAGE_SIZE)
 
+struct file_desc {
+  uint32_t offset;
+  uint32_t end;
+  uint16_t file_page;
+  uint8_t flags;
+  uint16_t max_pages;
+  uint16_t next_log_entry;
+};
+
 struct dir_cache {
-  char filename_start;
   int32_t page;
+  char filename_start;
 };
 
 struct file_header {
diff --git a/platform/esb/cfs-coffee-arch.h b/platform/esb/cfs-coffee-arch.h
index 1c49108e9..771526018 100644
--- a/platform/esb/cfs-coffee-arch.h
+++ b/platform/esb/cfs-coffee-arch.h
@@ -48,8 +48,6 @@
 #define COFFEE_PAGE_SIZE		64UL
 #define COFFEE_START			CFS_EEPROM_CONF_OFFSET
 #define COFFEE_SIZE			((32 kb) - COFFEE_START)
-#define COFFEE_PAGE_COUNT		(COFFEE_SIZE / COFFEE_PAGE_SIZE)
-#define COFFEE_PAGES_PER_SECTOR		(COFFEE_SECTOR_SIZE / COFFEE_PAGE_SIZE)
 #define COFFEE_NAME_LENGTH		16
 #define COFFEE_DYN_SIZE			(1 kb)
 #define COFFEE_FD_SET_SIZE		2
diff --git a/platform/sky/cfs-coffee-arch.h b/platform/sky/cfs-coffee-arch.h
index 5d528ffcd..d113c9f03 100644
--- a/platform/sky/cfs-coffee-arch.h
+++ b/platform/sky/cfs-coffee-arch.h
@@ -47,8 +47,6 @@
 #define COFFEE_PAGE_SIZE		256UL
 #define COFFEE_START			COFFEE_SECTOR_SIZE
 #define COFFEE_SIZE			((1024 kb) - COFFEE_START)
-#define COFFEE_PAGE_COUNT		(COFFEE_SIZE / COFFEE_PAGE_SIZE)
-#define COFFEE_PAGES_PER_SECTOR		(COFFEE_SECTOR_SIZE / COFFEE_PAGE_SIZE)
 #define COFFEE_NAME_LENGTH		16
 #define COFFEE_DYN_SIZE			(16 kb)
 #define COFFEE_FD_SET_SIZE		8