diff --git a/bin/xbps-create/main.c b/bin/xbps-create/main.c
index 1504f8dd..877e7c22 100644
--- a/bin/xbps-create/main.c
+++ b/bin/xbps-create/main.c
@@ -41,7 +41,7 @@
 #include <libgen.h>
 #include <locale.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "queue.h"
 
 #ifdef __clang__
diff --git a/bin/xbps-dgraph/main.c b/bin/xbps-dgraph/main.c
index dc80e50e..7b1d004f 100644
--- a/bin/xbps-dgraph/main.c
+++ b/bin/xbps-dgraph/main.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 
 #ifdef __clang__
 #pragma clang diagnostic ignored "-Wformat-nonliteral"
diff --git a/bin/xbps-install/defs.h b/bin/xbps-install/defs.h
index b6638bed..dff4a746 100644
--- a/bin/xbps-install/defs.h
+++ b/bin/xbps-install/defs.h
@@ -27,7 +27,7 @@
 #define _XBPS_INSTALL_DEFS_H_
 
 #include <sys/time.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 struct xferstat {
 	struct timeval start;
diff --git a/bin/xbps-install/fetch_cb.c b/bin/xbps-install/fetch_cb.c
index 4a90a94c..de671cfa 100644
--- a/bin/xbps-install/fetch_cb.c
+++ b/bin/xbps-install/fetch_cb.c
@@ -40,7 +40,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 #include "config.h"
 
diff --git a/bin/xbps-install/main.c b/bin/xbps-install/main.c
index 754d53df..32f8422e 100644
--- a/bin/xbps-install/main.c
+++ b/bin/xbps-install/main.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <getopt.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 static void __attribute__((noreturn))
diff --git a/bin/xbps-install/state_cb.c b/bin/xbps-install/state_cb.c
index 339ed8a0..394339f6 100644
--- a/bin/xbps-install/state_cb.c
+++ b/bin/xbps-install/state_cb.c
@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <syslog.h>
 #include <assert.h>
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 void
diff --git a/bin/xbps-install/transaction.c b/bin/xbps-install/transaction.c
index df239e60..4524a828 100644
--- a/bin/xbps-install/transaction.c
+++ b/bin/xbps-install/transaction.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct transaction {
diff --git a/bin/xbps-install/util.c b/bin/xbps-install/util.c
index 9d7be1c2..0fc1d562 100644
--- a/bin/xbps-install/util.c
+++ b/bin/xbps-install/util.c
@@ -32,7 +32,7 @@
 #include <strings.h>
 #include <sys/ioctl.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 int
diff --git a/bin/xbps-pkgdb/check.c b/bin/xbps-pkgdb/check.c
index 4b3162c8..1262ba3f 100644
--- a/bin/xbps-pkgdb/check.c
+++ b/bin/xbps-pkgdb/check.c
@@ -33,7 +33,7 @@
 #include <pthread.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct thread_data {
diff --git a/bin/xbps-pkgdb/check_pkg_files.c b/bin/xbps-pkgdb/check_pkg_files.c
index a76cfbaf..0f477f34 100644
--- a/bin/xbps-pkgdb/check_pkg_files.c
+++ b/bin/xbps-pkgdb/check_pkg_files.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*
diff --git a/bin/xbps-pkgdb/check_pkg_rundeps.c b/bin/xbps-pkgdb/check_pkg_rundeps.c
index 64db28c7..15287b4d 100644
--- a/bin/xbps-pkgdb/check_pkg_rundeps.c
+++ b/bin/xbps-pkgdb/check_pkg_rundeps.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*
diff --git a/bin/xbps-pkgdb/check_pkg_symlinks.c b/bin/xbps-pkgdb/check_pkg_symlinks.c
index 5bf6ce8b..056338e8 100644
--- a/bin/xbps-pkgdb/check_pkg_symlinks.c
+++ b/bin/xbps-pkgdb/check_pkg_symlinks.c
@@ -33,7 +33,7 @@
 #include <libgen.h>
 #include <sys/param.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*
diff --git a/bin/xbps-pkgdb/check_pkg_unneeded.c b/bin/xbps-pkgdb/check_pkg_unneeded.c
index b048ae4b..dd5520d1 100644
--- a/bin/xbps-pkgdb/check_pkg_unneeded.c
+++ b/bin/xbps-pkgdb/check_pkg_unneeded.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*
diff --git a/bin/xbps-pkgdb/convert.c b/bin/xbps-pkgdb/convert.c
index f12def45..56507b1b 100644
--- a/bin/xbps-pkgdb/convert.c
+++ b/bin/xbps-pkgdb/convert.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*
diff --git a/bin/xbps-pkgdb/defs.h b/bin/xbps-pkgdb/defs.h
index 2603fb11..02667a1c 100644
--- a/bin/xbps-pkgdb/defs.h
+++ b/bin/xbps-pkgdb/defs.h
@@ -27,7 +27,7 @@
 #define _XBPS_PKGDB_DEFS_H_
 
 #include <sys/time.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 /* from check.c */
 int	check_pkg_integrity(struct xbps_handle *, xbps_dictionary_t, const char *);
diff --git a/bin/xbps-pkgdb/main.c b/bin/xbps-pkgdb/main.c
index c63171b3..158b3ab9 100644
--- a/bin/xbps-pkgdb/main.c
+++ b/bin/xbps-pkgdb/main.c
@@ -31,7 +31,7 @@
 #include <getopt.h>
 #include <errno.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 static void __attribute__((noreturn))
diff --git a/bin/xbps-query/defs.h b/bin/xbps-query/defs.h
index 2268b6e7..4fb9be31 100644
--- a/bin/xbps-query/defs.h
+++ b/bin/xbps-query/defs.h
@@ -26,7 +26,7 @@
 #ifndef _XBPS_QUERY_DEFS_H_
 #define _XBPS_QUERY_DEFS_H_
 
-#include <xbps_api.h>
+#include <xbps.h>
 
 #include "../xbps-install/defs.h"
 
diff --git a/bin/xbps-query/main.c b/bin/xbps-query/main.c
index 7ff0924e..b3b4f2b2 100644
--- a/bin/xbps-query/main.c
+++ b/bin/xbps-query/main.c
@@ -29,7 +29,7 @@
 #include <getopt.h>
 #include <errno.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 static void __attribute__((noreturn))
diff --git a/bin/xbps-query/ownedby.c b/bin/xbps-query/ownedby.c
index 472be3fa..a607dcfa 100644
--- a/bin/xbps-query/ownedby.c
+++ b/bin/xbps-query/ownedby.c
@@ -32,7 +32,7 @@
 #include <dirent.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct ffdata {
diff --git a/bin/xbps-query/search.c b/bin/xbps-query/search.c
index c2909973..c014215f 100644
--- a/bin/xbps-query/search.c
+++ b/bin/xbps-query/search.c
@@ -41,7 +41,7 @@
 #include <fnmatch.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct search_data {
diff --git a/bin/xbps-query/show-deps.c b/bin/xbps-query/show-deps.c
index 11068a16..dc0e3569 100644
--- a/bin/xbps-query/show-deps.c
+++ b/bin/xbps-query/show-deps.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 static void
diff --git a/bin/xbps-query/show-info-files.c b/bin/xbps-query/show-info-files.c
index 89e93a97..244db86c 100644
--- a/bin/xbps-query/show-info-files.c
+++ b/bin/xbps-query/show-info-files.c
@@ -33,7 +33,7 @@
 #include <fnmatch.h>
 #include <assert.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 static void
diff --git a/bin/xbps-reconfigure/main.c b/bin/xbps-reconfigure/main.c
index f5969fdb..adc3e1be 100644
--- a/bin/xbps-reconfigure/main.c
+++ b/bin/xbps-reconfigure/main.c
@@ -31,7 +31,7 @@
 #include <getopt.h>
 #include <syslog.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 
 static void __attribute__((noreturn))
 usage(bool fail)
diff --git a/bin/xbps-remove/main.c b/bin/xbps-remove/main.c
index 2bb9b30f..75790610 100644
--- a/bin/xbps-remove/main.c
+++ b/bin/xbps-remove/main.c
@@ -36,7 +36,7 @@
 #include <dirent.h>
 #include <syslog.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "../xbps-install/defs.h"
 
 static void __attribute__((noreturn))
diff --git a/bin/xbps-rindex/defs.h b/bin/xbps-rindex/defs.h
index d40390e2..c9a04955 100644
--- a/bin/xbps-rindex/defs.h
+++ b/bin/xbps-rindex/defs.h
@@ -26,7 +26,7 @@
 #ifndef _XBPS_RINDEX_DEFS_H_
 #define _XBPS_RINDEX_DEFS_H_
 
-#include <xbps_api.h>
+#include <xbps.h>
 
 /* From index-add.c */
 int	index_add(struct xbps_handle *, int, char **, bool);
diff --git a/bin/xbps-rindex/index-add.c b/bin/xbps-rindex/index-add.c
index 9f87a04c..e17a3922 100644
--- a/bin/xbps-rindex/index-add.c
+++ b/bin/xbps-rindex/index-add.c
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <fcntl.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 /*
diff --git a/bin/xbps-rindex/index-clean.c b/bin/xbps-rindex/index-clean.c
index 967489da..e6435efa 100644
--- a/bin/xbps-rindex/index-clean.c
+++ b/bin/xbps-rindex/index-clean.c
@@ -35,7 +35,7 @@
 #include <pthread.h>
 #include <fcntl.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct thread_data {
diff --git a/bin/xbps-rindex/remove-obsoletes.c b/bin/xbps-rindex/remove-obsoletes.c
index b84f0f31..2663fb0d 100644
--- a/bin/xbps-rindex/remove-obsoletes.c
+++ b/bin/xbps-rindex/remove-obsoletes.c
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <pthread.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 struct thread_data {
diff --git a/bin/xbps-rindex/repoflush.c b/bin/xbps-rindex/repoflush.c
index 3b72c529..ba605e8d 100644
--- a/bin/xbps-rindex/repoflush.c
+++ b/bin/xbps-rindex/repoflush.c
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <fcntl.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "defs.h"
 
 int
diff --git a/bin/xbps-uhelper/main.c b/bin/xbps-uhelper/main.c
index d956e79e..0a5bbbe3 100644
--- a/bin/xbps-uhelper/main.c
+++ b/bin/xbps-uhelper/main.c
@@ -33,7 +33,7 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <xbps_api.h>
+#include <xbps.h>
 #include "../xbps-install/defs.h"
 
 static void
diff --git a/include/Makefile b/include/Makefile
index d19182c6..4b953bc5 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,6 +1,6 @@
 -include ../config.mk
 
-INCS =	xbps_api.h
+INCS =	xbps.h
 
 .PHONY: all
 all:
diff --git a/include/xbps_api.h.in b/include/xbps.h.in
similarity index 100%
rename from include/xbps_api.h.in
rename to include/xbps.h.in
diff --git a/include/xbps_api_impl.h b/include/xbps_api_impl.h
index 39e00704..3d978a73 100644
--- a/include/xbps_api_impl.h
+++ b/include/xbps_api_impl.h
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <confuse.h>
 #define LIBXBPS_PRIVATE
-#include <xbps_api.h>
+#include <xbps.h>
 
 /*
  * By default all public functions have default visibility, unless
diff --git a/tests/libxbps/cmpver/main.c b/tests/libxbps/cmpver/main.c
index bfd0fbd4..9ba8e0ca 100644
--- a/tests/libxbps/cmpver/main.c
+++ b/tests/libxbps/cmpver/main.c
@@ -25,7 +25,7 @@
  */
 
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 ATF_TC(cmpver_test);
 
diff --git a/tests/libxbps/find_pkg_obsoletes/main.c b/tests/libxbps/find_pkg_obsoletes/main.c
index 3bbd7020..74a97d0c 100644
--- a/tests/libxbps/find_pkg_obsoletes/main.c
+++ b/tests/libxbps/find_pkg_obsoletes/main.c
@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 static void
 append_file(xbps_dictionary_t d, const char *key, const char *fpath)
diff --git a/tests/libxbps/find_pkg_orphans/main.c b/tests/libxbps/find_pkg_orphans/main.c
index ba60a8ef..920b3f62 100644
--- a/tests/libxbps/find_pkg_orphans/main.c
+++ b/tests/libxbps/find_pkg_orphans/main.c
@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 static const char expected_output[] =
 	"xbps-git-20130310_2\n"
diff --git a/tests/libxbps/pkgdb/main.c b/tests/libxbps/pkgdb/main.c
index dc52ebe7..c57eaa2f 100644
--- a/tests/libxbps/pkgdb/main.c
+++ b/tests/libxbps/pkgdb/main.c
@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 ATF_TC(pkgdb_get_pkg_test);
 ATF_TC_HEAD(pkgdb_get_pkg_test, tc)
diff --git a/tests/libxbps/pkgpattern_match/main.c b/tests/libxbps/pkgpattern_match/main.c
index afa8e38e..341f4be3 100644
--- a/tests/libxbps/pkgpattern_match/main.c
+++ b/tests/libxbps/pkgpattern_match/main.c
@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 ATF_TC(pkgpattern_match_test);
 
diff --git a/tests/libxbps/plist_match/main.c b/tests/libxbps/plist_match/main.c
index 2b08e1d2..0bba068f 100644
--- a/tests/libxbps/plist_match/main.c
+++ b/tests/libxbps/plist_match/main.c
@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 static xbps_array_t
 array_init(void)
diff --git a/tests/libxbps/plist_match_virtual/main.c b/tests/libxbps/plist_match_virtual/main.c
index 57dae87f..849fce80 100644
--- a/tests/libxbps/plist_match_virtual/main.c
+++ b/tests/libxbps/plist_match_virtual/main.c
@@ -24,7 +24,7 @@
  *-
  */
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 static xbps_array_t
 rundeps_init(void)
diff --git a/tests/libxbps/util/main.c b/tests/libxbps/util/main.c
index f4a62c70..7fa85efc 100644
--- a/tests/libxbps/util/main.c
+++ b/tests/libxbps/util/main.c
@@ -25,7 +25,7 @@
  */
 #include <string.h>
 #include <atf-c.h>
-#include <xbps_api.h>
+#include <xbps.h>
 
 ATF_TC(util_test);