diff --git a/bin/xbps-bin/check.c b/bin/xbps-bin/check.c
index 1883302d5f..2d9297d758 100644
--- a/bin/xbps-bin/check.c
+++ b/bin/xbps-bin/check.c
@@ -27,11 +27,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
-#include <limits.h>
-#include <libgen.h>
-#include <unistd.h>
 
 #include <xbps_api.h>
 #include "defs.h"
diff --git a/bin/xbps-bin/install.c b/bin/xbps-bin/install.c
index 01598ccbaa..291c9becaa 100644
--- a/bin/xbps-bin/install.c
+++ b/bin/xbps-bin/install.c
@@ -27,10 +27,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <err.h>
 #include <errno.h>
-#include <limits.h>
-#include <prop/proplib.h>
 
 #include <xbps_api.h>
 #include "defs.h"
diff --git a/bin/xbps-bin/main.c b/bin/xbps-bin/main.c
index 1fb47372c1..93514348c2 100644
--- a/bin/xbps-bin/main.c
+++ b/bin/xbps-bin/main.c
@@ -27,11 +27,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
-#include <limits.h>
-#include <libgen.h>
-#include <unistd.h>
 
 #include <xbps_api.h>
 #include "defs.h"
diff --git a/bin/xbps-bin/remove.c b/bin/xbps-bin/remove.c
index 2a990e7eef..3dcc3d57de 100644
--- a/bin/xbps-bin/remove.c
+++ b/bin/xbps-bin/remove.c
@@ -27,11 +27,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
-#include <limits.h>
-#include <libgen.h>
-#include <unistd.h>
 
 #include <xbps_api.h>
 #include "defs.h"
diff --git a/bin/xbps-cmpver/main.c b/bin/xbps-cmpver/main.c
index 40bcf76077..abf99c360f 100644
--- a/bin/xbps-cmpver/main.c
+++ b/bin/xbps-cmpver/main.c
@@ -3,8 +3,6 @@
  * @ 2008
  * Author: pancake <youterm.com>
  */
-#include <stdio.h>
-#include <string.h>
 #include <xbps_api.h>
 
 int main(int argc, char **argv)
diff --git a/bin/xbps-digest/main.c b/bin/xbps-digest/main.c
index 4ba805aeb8..8fb1161c85 100644
--- a/bin/xbps-digest/main.c
+++ b/bin/xbps-digest/main.c
@@ -23,17 +23,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
-#include <inttypes.h>
-#include <libgen.h>
 
 #include <xbps_api.h>
 
diff --git a/bin/xbps-pkgdb/main.c b/bin/xbps-pkgdb/main.c
index 012dd33a41..602566205a 100644
--- a/bin/xbps-pkgdb/main.c
+++ b/bin/xbps-pkgdb/main.c
@@ -27,9 +27,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
-#include <limits.h>
 
 #include <xbps_api.h>
 
diff --git a/bin/xbps-repo/index.c b/bin/xbps-repo/index.c
index 6bbe929789..765af48ec4 100644
--- a/bin/xbps-repo/index.c
+++ b/bin/xbps-repo/index.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <errno.h>
 #include <dirent.h>
-#include <sys/stat.h>
 #include <sys/utsname.h>
 
 #include <xbps_api.h>
diff --git a/bin/xbps-repo/main.c b/bin/xbps-repo/main.c
index 79b7166952..cc281eb237 100644
--- a/bin/xbps-repo/main.c
+++ b/bin/xbps-repo/main.c
@@ -27,11 +27,9 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
 #include <limits.h>
 #include <libgen.h>
-#include <unistd.h>
 
 #include <xbps_api.h>
 #include "index.h"
diff --git a/bin/xbps-repo/util.c b/bin/xbps-repo/util.c
index 50ddd2cf8b..ca4189ee88 100644
--- a/bin/xbps-repo/util.c
+++ b/bin/xbps-repo/util.c
@@ -29,8 +29,6 @@
 #include <string.h>
 #include <errno.h>
 #include <fnmatch.h>
-#include <limits.h>
-#include <prop/proplib.h>
 
 #include <xbps_api.h>
 #include "util.h"
diff --git a/lib/cmpver.c b/lib/cmpver.c
index 5206c39a26..5fd9ede91b 100644
--- a/lib/cmpver.c
+++ b/lib/cmpver.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <ctype.h>
 #include <xbps_api.h>
 
diff --git a/lib/configure.c b/lib/configure.c
index 7e7ab5c677..ce700e85dd 100644
--- a/lib/configure.c
+++ b/lib/configure.c
@@ -24,14 +24,9 @@
  */
 
 #include <stdio.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
 
 #include <xbps_api.h>
 
diff --git a/lib/depends.c b/lib/depends.c
index e1db2eeea1..bbd1379448 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -24,11 +24,9 @@
  */
 
 #include <stdio.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>
 
 #include <xbps_api.h>
 
diff --git a/lib/fexec.c b/lib/fexec.c
index aaa049105d..a6f8469e5f 100644
--- a/lib/fexec.c
+++ b/lib/fexec.c
@@ -32,7 +32,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 
 #include <xbps_api.h>
diff --git a/lib/findpkg.c b/lib/findpkg.c
index fef1ac9fa1..d1e180a02f 100644
--- a/lib/findpkg.c
+++ b/lib/findpkg.c
@@ -28,9 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-#include <fcntl.h>
 
 #include <xbps_api.h>
 
diff --git a/lib/orphans.c b/lib/orphans.c
index 311e09eed5..5637092da0 100644
--- a/lib/orphans.c
+++ b/lib/orphans.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include <xbps_api.h>
 
diff --git a/lib/plist.c b/lib/plist.c
index 83ce5727bf..637a6c046b 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -28,8 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>
-#include <prop/proplib.h>
 
 #include <xbps_api.h>
 
diff --git a/lib/register.c b/lib/register.c
index 8b778ecc86..e8859c5482 100644
--- a/lib/register.c
+++ b/lib/register.c
@@ -24,13 +24,9 @@
  */
 
 #include <stdio.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-#include <fcntl.h>
 
 #include <xbps_api.h>
 
diff --git a/lib/remove.c b/lib/remove.c
index 67a0cf09bb..329666c3db 100644
--- a/lib/remove.c
+++ b/lib/remove.c
@@ -28,10 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <ctype.h>
 #include <dirent.h>
 
 #include <xbps_api.h>
diff --git a/lib/repository.c b/lib/repository.c
index 5cf6d82ae2..1d6edebf5f 100644
--- a/lib/repository.c
+++ b/lib/repository.c
@@ -24,12 +24,9 @@
  */
 
 #include <stdio.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>
-#include <prop/proplib.h>
 
 #include <xbps_api.h>
 
diff --git a/lib/requiredby.c b/lib/requiredby.c
index 1b7304aacb..6e9acc3c72 100644
--- a/lib/requiredby.c
+++ b/lib/requiredby.c
@@ -28,9 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-#include <fcntl.h>
 
 #include <xbps_api.h>
 
diff --git a/lib/sortdeps.c b/lib/sortdeps.c
index 2f6b11f3b5..abc917c47c 100644
--- a/lib/sortdeps.c
+++ b/lib/sortdeps.c
@@ -24,12 +24,9 @@
  */
 
 #include <stdio.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>
-#include <sys/queue.h>
 
 #include <xbps_api.h>
 
diff --git a/lib/state.c b/lib/state.c
index 18b544be94..7953f5d1b4 100644
--- a/lib/state.c
+++ b/lib/state.c
@@ -28,9 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-#include <fcntl.h>
 
 #include <xbps_api.h>
 
diff --git a/lib/unpack.c b/lib/unpack.c
index a196337ce3..83c9f5103c 100644
--- a/lib/unpack.c
+++ b/lib/unpack.c
@@ -28,10 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <limits.h>
-#include <unistd.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 
 #include <xbps_api.h>
 
diff --git a/lib/util.c b/lib/util.c
index c85e4706da..2e5c81be2b 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -31,7 +31,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <ctype.h>
-#include <limits.h>
 #include <sys/utsname.h>
 
 #include <xbps_api.h>