diff --git a/src/backend_chromium.c b/src/backend_chromium.c
index 2b68185..4a3c6e6 100644
--- a/src/backend_chromium.c
+++ b/src/backend_chromium.c
@@ -37,7 +37,6 @@
 
 #include <fcntl.h>
 #include <iconv.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #ifdef BOOKMARKFS_BACKEND_CHROMIUM_WRITE
diff --git a/src/backend_firefox.c b/src/backend_firefox.c
index e5bcf08..407eecc 100644
--- a/src/backend_firefox.c
+++ b/src/backend_firefox.c
@@ -35,7 +35,6 @@
 #include <string.h>
 
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #ifdef BOOKMARKFS_BACKEND_FIREFOX_WRITE
diff --git a/src/bookmarkctl.c b/src/bookmarkctl.c
index f7893ab..f5ece20 100644
--- a/src/bookmarkctl.c
+++ b/src/bookmarkctl.c
@@ -25,8 +25,6 @@
 #endif
 
 #include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/db.c b/src/db.c
index 5dcb198..4a9652e 100644
--- a/src/db.c
+++ b/src/db.c
@@ -28,7 +28,6 @@
 
 #include <errno.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <string.h>
 
 #include "xstd.h"
diff --git a/src/frontend_util.h b/src/frontend_util.h
index ed7d93a..3c1be36 100644
--- a/src/frontend_util.h
+++ b/src/frontend_util.h
@@ -23,7 +23,6 @@
 #ifndef BOOKMARKFS_FRONTEND_UTIL_H_
 #define BOOKMARKFS_FRONTEND_UTIL_H_
 
-#include <stdint.h>
 #include <stdlib.h>
 
 #include "backend.h"
diff --git a/src/fs_ops.c b/src/fs_ops.c
index 90ec891..36a5f08 100644
--- a/src/fs_ops.c
+++ b/src/fs_ops.c
@@ -31,6 +31,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <fcntl.h>
+#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/src/fsck.c b/src/fsck.c
index 3e8bc83..cb59ff5 100644
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -26,7 +26,6 @@
 #  include "config.h"
 #endif
 
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/fsck_handler_simple.c b/src/fsck_handler_simple.c
index 97c7001..015b701 100644
--- a/src/fsck_handler_simple.c
+++ b/src/fsck_handler_simple.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <inttypes.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/fsck_handler_tcl.c b/src/fsck_handler_tcl.c
index b2b62e0..17567a7 100644
--- a/src/fsck_handler_tcl.c
+++ b/src/fsck_handler_tcl.c
@@ -25,7 +25,9 @@
 #endif
 
 #include <errno.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <fcntl.h>
 #include <sys/mman.h>
diff --git a/src/fsck_online.c b/src/fsck_online.c
index 96fc69e..fd95ba3 100644
--- a/src/fsck_online.c
+++ b/src/fsck_online.c
@@ -25,8 +25,8 @@
 #endif
 
 #include <errno.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <dirent.h>
 #include <fcntl.h>
diff --git a/src/hashmap.c b/src/hashmap.c
index 4286450..a1cd827 100644
--- a/src/hashmap.c
+++ b/src/hashmap.c
@@ -35,7 +35,6 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "xstd.h"
diff --git a/src/json.c b/src/json.c
index f0619f4..adc491e 100644
--- a/src/json.c
+++ b/src/json.c
@@ -29,6 +29,8 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <fcntl.h>
diff --git a/src/mkfs.c b/src/mkfs.c
index ca38ac8..fcd0f44 100644
--- a/src/mkfs.c
+++ b/src/mkfs.c
@@ -26,8 +26,8 @@
 #  include "config.h"
 #endif
 
+#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <unistd.h>
 
diff --git a/src/mount.c b/src/mount.c
index 444d04c..33758b2 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -24,9 +24,6 @@
 #  include "config.h"
 #endif
 
-#include <errno.h>
-#include <limits.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -37,7 +34,6 @@
 #include "fs_ops.h"
 #include "lib.h"
 #include "macros.h"
-#include "prng.h"
 #include "version.h"
 #include "xstd.h"
 
diff --git a/src/sandbox.c b/src/sandbox.c
index 3653cab..358839b 100644
--- a/src/sandbox.c
+++ b/src/sandbox.c
@@ -27,7 +27,6 @@
 #include "sandbox.h"
 
 #include <errno.h>
-#include <stdio.h>
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/uuid.c b/src/uuid.c
index 05da5ab..2ba30a6 100644
--- a/src/uuid.c
+++ b/src/uuid.c
@@ -26,7 +26,6 @@
 
 #include "uuid.h"
 
-#include <errno.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/watcher.c b/src/watcher.c
index 872d298..5437385 100644
--- a/src/watcher.c
+++ b/src/watcher.c
@@ -27,9 +27,7 @@
 #include "watcher.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <fcntl.h>
 #include <poll.h>
diff --git a/src/xstd.h b/src/xstd.h
index fa6c35b..08c8227 100644
--- a/src/xstd.h
+++ b/src/xstd.h
@@ -23,7 +23,6 @@
 #ifndef BOOKMARKFS_XSTD_H_
 #define BOOKMARKFS_XSTD_H_
 
-#include <stddef.h>
 #include <stdio.h>
 
 #include "defs.h"