Starting to clean up the public API, move private stuff into xbps_api_impl.h.

lib/cmpver.c

@@ -23,7 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /*
  * split_version(pkgname, endname, epoch, revision) returns a pointer to

lib/fexec.c

@@ -35,6 +35,7 @@
 #include <string.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/fexec.c

lib/package_config_files.c

@@ -31,6 +31,7 @@
 #include <fcntl.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 int HIDDEN
 xbps_config_file_from_archive_entry(prop_dictionary_t d,

lib/package_configure.c

@@ -28,6 +28,9 @@
 #include <string.h>
 #include <errno.h>
 
+#include <xbps_api.h>
+#include "xbps_api_impl.h"
+
 /**
  * @file lib/configure.c
  * @brief Package configuration routines
@@ -44,7 +47,6 @@
  * (or packages) will be reconfigured even if its state is
  * XBPS_PKG_STATE_INSTALLED.
  */
-#include <xbps_api.h>
 
 int
 xbps_configure_all_pkgs(void)

lib/package_purge.c

@@ -30,6 +30,7 @@
 #include <dirent.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/purge.c

lib/package_register.c

@@ -29,6 +29,7 @@
 #include <errno.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/register.c

lib/package_remove.c

@@ -32,6 +32,7 @@
 #include <libgen.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/remove.c

lib/package_remove_obsoletes.c

@@ -34,6 +34,7 @@
 #include <libgen.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 int HIDDEN
 xbps_remove_obsoletes(prop_dictionary_t oldd, prop_dictionary_t newd)

lib/package_requiredby.c

@@ -30,6 +30,7 @@
 #include <errno.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 static int
 add_pkg_into_reqby(prop_dictionary_t pkgd, const char *reqname)

lib/package_state.c

@@ -30,6 +30,7 @@
 #include <errno.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/state.c

lib/package_unpack.c

@@ -31,6 +31,7 @@
 #include <fcntl.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/unpack.c

lib/plist.c

@@ -29,8 +29,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include <xbps_api.h>
 #include <zlib.h>
+#include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/plist.c

lib/regpkgs_dictionary.c

@@ -30,6 +30,7 @@
 #include <errno.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/regpkgs_dictionary.c

lib/repository.c

@@ -30,6 +30,7 @@
 #include <libgen.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/repository.c

lib/repository_finddeps.c

@@ -29,6 +29,7 @@
 #include <errno.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 static int
 store_dependency(prop_dictionary_t trans_dict, prop_dictionary_t repo_pkg_dict,

lib/repository_findpkg.c

@@ -30,6 +30,7 @@
 #include <errno.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/repository_findpkg.c

lib/repository_plist.c

@@ -32,6 +32,7 @@
 #include <errno.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 #include "fetch.h"
 
 /**

lib/repository_pool.c

@@ -30,6 +30,7 @@
 #include <errno.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/repository_pool.c

lib/repository_sync_index.c

@@ -31,6 +31,7 @@
 #include <errno.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 #include "fetch.h"
 
 /**

lib/sortdeps.c

@@ -29,6 +29,7 @@
 #include <errno.h>
 
 #include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 struct sorted_dependency {
 	SIMPLEQ_ENTRY(sorted_dependency) chain;

lib/util.c

@@ -35,9 +35,10 @@
 #include <sys/mman.h>
 #include <limits.h>
 
-#include <xbps_api.h>
-#include <openssl/sha.h>
 #include "config.h"
+#include <openssl/sha.h>
+#include <xbps_api.h>
+#include "xbps_api_impl.h"
 
 /**
  * @file lib/util.c