diff -r 6e93e5485947 -r f71695220726 librazor/razor-internal.h
--- a/librazor/razor-internal.h	Fri Jul 03 18:02:33 2009 +0100
+++ b/librazor/razor-internal.h	Sat Jul 04 11:11:59 2009 +0100
@@ -37,8 +37,8 @@
 #endif
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#define ALIGN(value, base) (((value) + (base - 1)) & ~((base) - 1))
-
+#define PADDING(value, base) (-(value) & (base - 1))
+#define ALIGN(value, base) ((value) + PADDING(value, base))
 void *zalloc(size_t size);
 
 struct razor_set_section {
@@ -118,15 +118,7 @@
  	struct array prefix_pool;
 	struct array file_string_pool;
 	struct array details_string_pool;
-
-	struct razor_set_header *header;
-	size_t header_size;
-
-	struct razor_set_header *details_header;
-	size_t details_header_size;
-
-	struct razor_set_header *files_header;
-	size_t files_header_size;
+	struct razor_mapped_file *mapped_files;
 };
 
 struct import_entry {