9 files changed, 16 insertions, 6 deletions
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 284a57c..d29c169 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -42,9 +42,11 @@ libutil_la_SOURCES += lib/util/read_data_at.c lib/util/alloc.c
 libutil_la_CFLAGS = $(AM_CFLAGS)
 libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
 
-libsquashfs_la_SOURCES = include/sqfs/squashfs.h include/sqfs/meta_writer.h
+libsquashfs_la_SOURCES = include/sqfs/data.h include/sqfs/meta_writer.h
 libsquashfs_la_SOURCES += include/sqfs/meta_reader.h include/sqfs/id_table.h
 libsquashfs_la_SOURCES += include/sqfs/compress.h include/sqfs/block_processor.h
+libsquashfs_la_SOURCES += include/sqfs/super.h include/sqfs/inode.h
+libsquashfs_la_SOURCES += include/sqfs/dir.h include/sqfs/xattr.h
 libsquashfs_la_SOURCES += lib/sqfs/meta_writer.c lib/sqfs/super.c
 libsquashfs_la_SOURCES += lib/sqfs/id_table.c
 libsquashfs_la_SOURCES += lib/sqfs/write_table.c include/highlevel.h
@@ -104,9 +106,11 @@ libfstree_a_CPPFLAGS += -DWITH_SELINUX
 endif
 
 sqfsincludedir = $(includedir)/sqfs
-sqfsinclude_HEADERS = include/sqfs/squashfs.h include/sqfs/meta_writer.h
+sqfsinclude_HEADERS = include/sqfs/data.h include/sqfs/meta_writer.h
 sqfsinclude_HEADERS += include/sqfs/meta_reader.h include/sqfs/id_table.h
 sqfsinclude_HEADERS += include/sqfs/compress.h include/sqfs/block_processor.h
+sqfsinclude_HEADERS += include/sqfs/super.h include/sqfs/inode.h
+sqfsinclude_HEADERS += include/sqfs/dir.h include/sqfs/xattr.h
 
 noinst_LIBRARIES += libfstree.a libtar.a libsqfshelper.a
 noinst_LTLIBRARIES += libutil.la
diff --git a/lib/sqfs/meta_writer.c b/lib/sqfs/meta_writer.c
index 5fd31db..1f7825a 100644
--- a/lib/sqfs/meta_writer.c
+++ b/lib/sqfs/meta_writer.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "sqfs/meta_writer.h"
-#include "sqfs/squashfs.h"
+#include "sqfs/data.h"
 #include "util.h"
 
 #include <string.h>
diff --git a/lib/sqfs/read_super.c b/lib/sqfs/read_super.c
index 094cad5..b9525b3 100644
--- a/lib/sqfs/read_super.c
+++ b/lib/sqfs/read_super.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "sqfs/squashfs.h"
+#include "sqfs/super.h"
 #include "util.h"
 
 #include <endian.h>
diff --git a/lib/sqfs/super.c b/lib/sqfs/super.c
index f4ca6d9..728c0e1 100644
--- a/lib/sqfs/super.c
+++ b/lib/sqfs/super.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "sqfs/squashfs.h"
+#include "sqfs/super.h"
 #include "util.h"
 
 #include <endian.h>
diff --git a/lib/sqfs/xattr.c b/lib/sqfs/xattr.c
index 21bd7a5..fb8cb79 100644
--- a/lib/sqfs/xattr.c
+++ b/lib/sqfs/xattr.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "sqfs/squashfs.h"
+#include "sqfs/xattr.h"
 
 #include <string.h>
 
diff --git a/lib/sqfshelper/write_dir.c b/lib/sqfshelper/write_dir.c
index 695a902..2b94667 100644
--- a/lib/sqfshelper/write_dir.c
+++ b/lib/sqfshelper/write_dir.c
@@ -7,6 +7,8 @@
 #include "config.h"
 
 #include "sqfs/meta_writer.h"
+#include "sqfs/inode.h"
+#include "sqfs/dir.h"
 #include "util.h"
 
 #include <assert.h>
diff --git a/lib/sqfshelper/write_inode.c b/lib/sqfshelper/write_inode.c
index c550c13..020eb64 100644
--- a/lib/sqfshelper/write_inode.c
+++ b/lib/sqfshelper/write_inode.c
@@ -7,6 +7,8 @@
 #include "config.h"
 
 #include "sqfs/meta_writer.h"
+#include "sqfs/inode.h"
+#include "sqfs/dir.h"
 #include "util.h"
 
 #include <assert.h>
diff --git a/lib/sqfshelper/write_xattr.c b/lib/sqfshelper/write_xattr.c
index 9255695..ddedc55 100644
--- a/lib/sqfshelper/write_xattr.c
+++ b/lib/sqfshelper/write_xattr.c
@@ -7,6 +7,7 @@
 #include "config.h"
 
 #include "sqfs/meta_writer.h"
+#include "sqfs/xattr.h"
 #include "highlevel.h"
 #include "util.h"
 
diff --git a/lib/sqfshelper/xattr_reader.c b/lib/sqfshelper/xattr_reader.c
index 46e1146..c13358d 100644
--- a/lib/sqfshelper/xattr_reader.c
+++ b/lib/sqfshelper/xattr_reader.c
@@ -7,6 +7,7 @@
 #include "config.h"
 
 #include "sqfs/meta_reader.h"
+#include "sqfs/xattr.h"
 #include "xattr_reader.h"
 #include "util.h"