Index: uspace/lib/ext4/src/balloc.c
===================================================================
--- uspace/lib/ext4/src/balloc.c	(revision 3345b8643e43d3ed4e6235473b2897c18e8a697c)
+++ uspace/lib/ext4/src/balloc.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -37,5 +37,11 @@
 #include <errno.h>
 #include <sys/types.h>
-#include "ext4/libext4.h"
+#include "ext4/balloc.h"
+#include "ext4/bitmap.h"
+#include "ext4/block_group.h"
+#include "ext4/filesystem.h"
+#include "ext4/inode.h"
+#include "ext4/superblock.h"
+#include "ext4/types.h"
 
 /** Free block.
Index: uspace/lib/ext4/src/bitmap.c
===================================================================
--- uspace/lib/ext4/src/bitmap.c	(revision 3345b8643e43d3ed4e6235473b2897c18e8a697c)
+++ uspace/lib/ext4/src/bitmap.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -38,5 +38,5 @@
 #include <block.h>
 #include <sys/types.h>
-#include "ext4/libext4.h"
+#include "ext4/bitmap.h"
 
 /** Set bit in bitmap to 0 (free).
Index: uspace/lib/ext4/src/block_group.c
===================================================================
--- uspace/lib/ext4/src/block_group.c	(revision 3345b8643e43d3ed4e6235473b2897c18e8a697c)
+++ uspace/lib/ext4/src/block_group.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -37,5 +37,6 @@
 
 #include <byteorder.h>
-#include "ext4/libext4.h"
+#include "ext4/block_group.h"
+#include "ext4/superblock.h"
 
 /** Get address of block with data block bitmap.
Index: uspace/lib/ext4/src/directory.c
===================================================================
--- uspace/lib/ext4/src/directory.c	(revision 3345b8643e43d3ed4e6235473b2897c18e8a697c)
+++ uspace/lib/ext4/src/directory.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -39,5 +39,11 @@
 #include <errno.h>
 #include <malloc.h>
-#include "ext4/libext4.h"
+#include <mem.h>
+#include <str.h>
+#include "ext4/directory.h"
+#include "ext4/directory_index.h"
+#include "ext4/filesystem.h"
+#include "ext4/inode.h"
+#include "ext4/superblock.h"
 
 /** Get i-node number from directory entry.
Index: uspace/lib/ext4/src/directory_index.c
===================================================================
--- uspace/lib/ext4/src/directory_index.c	(revision 3345b8643e43d3ed4e6235473b2897c18e8a697c)
+++ uspace/lib/ext4/src/directory_index.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -37,7 +37,14 @@
 #include <byteorder.h>
 #include <errno.h>
-#include <malloc.h>
+#include <mem.h>
 #include <sort.h>
-#include "ext4/libext4.h"
+#include <stdlib.h>
+#include <str.h>
+#include "ext4/directory.h"
+#include "ext4/directory_index.h"
+#include "ext4/filesystem.h"
+#include "ext4/hash.h"
+#include "ext4/inode.h"
+#include "ext4/superblock.h"
 
 /** Type entry to pass to sorting algorithm.
Index: uspace/lib/ext4/src/extent.c
===================================================================
--- uspace/lib/ext4/src/extent.c	(revision 3345b8643e43d3ed4e6235473b2897c18e8a697c)
+++ uspace/lib/ext4/src/extent.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -38,5 +38,9 @@
 #include <errno.h>
 #include <malloc.h>
-#include "ext4/libext4.h"
+#include <mem.h>
+#include "ext4/balloc.h"
+#include "ext4/extent.h"
+#include "ext4/inode.h"
+#include "ext4/superblock.h"
 
 /** Get logical number of the block covered by extent.
Index: uspace/lib/ext4/src/filesystem.c
===================================================================
--- uspace/lib/ext4/src/filesystem.c	(revision 3345b8643e43d3ed4e6235473b2897c18e8a697c)
+++ uspace/lib/ext4/src/filesystem.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -38,9 +38,17 @@
 #include <byteorder.h>
 #include <errno.h>
-#include <malloc.h>
-#include <ipc/vfs.h>
+#include <mem.h>
 #include <align.h>
 #include <crypto.h>
-#include "ext4/libext4.h"
+#include <ipc/vfs.h>
+#include <stdlib.h>
+#include "ext4/balloc.h"
+#include "ext4/bitmap.h"
+#include "ext4/block_group.h"
+#include "ext4/extent.h"
+#include "ext4/filesystem.h"
+#include "ext4/ialloc.h"
+#include "ext4/inode.h"
+#include "ext4/superblock.h"
 
 /** Initialize filesystem and read all needed data.
Index: uspace/lib/ext4/src/hash.c
===================================================================
--- uspace/lib/ext4/src/hash.c	(revision 3345b8643e43d3ed4e6235473b2897c18e8a697c)
+++ uspace/lib/ext4/src/hash.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -35,6 +35,6 @@
  */
 
-#include "ext4/libext4.h"
 #include <errno.h>
+#include "ext4/hash.h"
 
 int ext4_hash_string(ext4_hash_info_t *hinfo, int len, const char *name)
Index: uspace/lib/ext4/src/ialloc.c
===================================================================
--- uspace/lib/ext4/src/ialloc.c	(revision 3345b8643e43d3ed4e6235473b2897c18e8a697c)
+++ uspace/lib/ext4/src/ialloc.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -36,6 +36,10 @@
 
 #include <errno.h>
-#include <time.h>
-#include "ext4/libext4.h"
+#include <stdbool.h>
+#include "ext4/bitmap.h"
+#include "ext4/block_group.h"
+#include "ext4/filesystem.h"
+#include "ext4/ialloc.h"
+#include "ext4/superblock.h"
 
 
Index: uspace/lib/ext4/src/inode.c
===================================================================
--- uspace/lib/ext4/src/inode.c	(revision 3345b8643e43d3ed4e6235473b2897c18e8a697c)
+++ uspace/lib/ext4/src/inode.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -36,8 +36,9 @@
  */
 
+#include <block.h>
 #include <byteorder.h>
 #include <errno.h>
-#include <block.h>
-#include "ext4/libext4.h"
+#include "ext4/inode.h"
+#include "ext4/superblock.h"
 
 /** Compute number of bits for block count.
Index: uspace/lib/ext4/src/superblock.c
===================================================================
--- uspace/lib/ext4/src/superblock.c	(revision 3345b8643e43d3ed4e6235473b2897c18e8a697c)
+++ uspace/lib/ext4/src/superblock.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -37,9 +37,10 @@
  */
 
+#include <block.h>
 #include <byteorder.h>
 #include <errno.h>
-#include <block.h>
 #include <malloc.h>
-#include "ext4/libext4.h"
+#include <mem.h>
+#include "ext4/superblock.h"
 
 /** Get number of i-nodes in the whole filesystem.