Move data structure forward declarations to predef header

This in turn allows for removing most of the header inclusions
within the public headers.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

10 files changed, 14 insertions, 0 deletions

diff --git a/lib/sqfs/block_processor_parallel.c b/lib/sqfs/block_processor_parallel.c
index d81ba91..3184d8b 100644
--- a/lib/sqfs/block_processor_parallel.c
+++ b/lib/sqfs/block_processor_parallel.c
@@ -8,6 +8,7 @@
 #include "config.h"
 
 #include "sqfs/block_processor.h"
+#include "sqfs/compress.h"
 #include "util.h"
 
 #include <pthread.h>
diff --git a/lib/sqfs/dir_writer.c b/lib/sqfs/dir_writer.c
index 6ff9541..d6921e7 100644
--- a/lib/sqfs/dir_writer.c
+++ b/lib/sqfs/dir_writer.c
@@ -7,7 +7,9 @@
 #define SQFS_BUILDING_DLL
 #include "config.h"
 
+#include "sqfs/meta_writer.h"
 #include "sqfs/inode.h"
+#include "sqfs/data.h"
 #include "sqfs/dir.h"
 #include "util.h"
 
diff --git a/lib/sqfs/id_table.c b/lib/sqfs/id_table.c
index cf1fd9b..f7ffe2d 100644
--- a/lib/sqfs/id_table.c
+++ b/lib/sqfs/id_table.c
@@ -8,6 +8,7 @@
 #include "config.h"
 
 #include "sqfs/id_table.h"
+#include "sqfs/super.h"
 #include "sqfs/table.h"
 
 #include <stdlib.h>
diff --git a/lib/sqfs/meta_reader.c b/lib/sqfs/meta_reader.c
index c95360d..38aac7e 100644
--- a/lib/sqfs/meta_reader.c
+++ b/lib/sqfs/meta_reader.c
@@ -8,6 +8,8 @@
 #include "config.h"
 
 #include "sqfs/meta_reader.h"
+#include "sqfs/compress.h"
+#include "sqfs/data.h"
 #include "util.h"
 
 #include <stdlib.h>
diff --git a/lib/sqfs/meta_writer.c b/lib/sqfs/meta_writer.c
index 8bea3a7..fdeea2e 100644
--- a/lib/sqfs/meta_writer.c
+++ b/lib/sqfs/meta_writer.c
@@ -8,6 +8,7 @@
 #include "config.h"
 
 #include "sqfs/meta_writer.h"
+#include "sqfs/compress.h"
 #include "sqfs/data.h"
 #include "util.h"
 
diff --git a/lib/sqfs/process_block.c b/lib/sqfs/process_block.c
index 9e1e8cc..2658ee7 100644
--- a/lib/sqfs/process_block.c
+++ b/lib/sqfs/process_block.c
@@ -8,6 +8,7 @@
 #include "config.h"
 
 #include "sqfs/block_processor.h"
+#include "sqfs/compress.h"
 #include "util.h"
 
 #include <string.h>
diff --git a/lib/sqfs/read_inode.c b/lib/sqfs/read_inode.c
index c249c95..70ed9f1 100644
--- a/lib/sqfs/read_inode.c
+++ b/lib/sqfs/read_inode.c
@@ -7,6 +7,8 @@
 #define SQFS_BUILDING_DLL
 #include "config.h"
 
+#include "sqfs/meta_reader.h"
+#include "sqfs/super.h"
 #include "sqfs/inode.h"
 #include "util.h"
 
diff --git a/lib/sqfs/readdir.c b/lib/sqfs/readdir.c
index 1c1082a..e1712be 100644
--- a/lib/sqfs/readdir.c
+++ b/lib/sqfs/readdir.c
@@ -7,6 +7,7 @@
 #define SQFS_BUILDING_DLL
 #include "config.h"
 
+#include "sqfs/meta_reader.h"
 #include "sqfs/dir.h"
 
 #include <stdlib.h>
diff --git a/lib/sqfs/write_inode.c b/lib/sqfs/write_inode.c
index 7714da9..c51c1a3 100644
--- a/lib/sqfs/write_inode.c
+++ b/lib/sqfs/write_inode.c
@@ -7,6 +7,7 @@
 #define SQFS_BUILDING_DLL
 #include "config.h"
 
+#include "sqfs/meta_writer.h"
 #include "sqfs/inode.h"
 
 static int write_block_sizes(sqfs_meta_writer_t *ir, sqfs_inode_generic_t *n)
diff --git a/lib/sqfs/xattr_reader.c b/lib/sqfs/xattr_reader.c
index 11933d8..aeee574 100644
--- a/lib/sqfs/xattr_reader.c
+++ b/lib/sqfs/xattr_reader.c
@@ -8,7 +8,9 @@
 #include "config.h"
 
 #include "sqfs/meta_reader.h"
+#include "sqfs/super.h"
 #include "sqfs/xattr.h"
+#include "sqfs/data.h"
 #include "util.h"
 
 #include <stdlib.h>