diff --git a/include/fexec.h b/include/fexec.h
index b753ccae593..623f5d47c29 100644
--- a/include/fexec.h
+++ b/include/fexec.h
@@ -30,8 +30,9 @@
 #ifndef _XBPS_FEXEC_H_
 #define _XBPS_FEXEC_H_
 
+/* From lib/fexec.c */
 int	xbps_file_exec(const char *, ...);
 int	xbps_file_exec_skipempty(const char *, ...);
 int	xbps_file_chdir_exec(const char *, const char *, ...);
 
-#endif
+#endif /* !_XBPS_FEXEC_H_ */
diff --git a/include/humanize_number.h b/include/humanize_number.h
index 8a744785f5c..ec16a61c9dc 100644
--- a/include/humanize_number.h
+++ b/include/humanize_number.h
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _HUMANIZE_NUMBER_H_
-#define _HUMANIZE_NUMBER_H_
+#ifndef _XBPS_HUMANIZE_NUMBER_H_
+#define _XBPS_HUMANIZE_NUMBER_H_
 
 #define HN_DECIMAL		0x01
 #define HN_NOSPACE		0x02
@@ -38,6 +38,7 @@
 #define HN_GETSCALE		0x10
 #define HN_AUTOSCALE		0x20
 
+/* From lib/humanize_number.c */
 int xbps_humanize_number(char *, size_t, int64_t, const char *, int, int);
 
-#endif
+#endif /* !_XBPS_HUMANIZE_NUMBER_H_ */
diff --git a/include/plist.h b/include/plist.h
index ae750d16b05..af672ef18ec 100644
--- a/include/plist.h
+++ b/include/plist.h
@@ -26,6 +26,7 @@
 #ifndef _XBPS_PLIST_H_
 #define _XBPS_PLIST_H_
 
+/* From lib/plist.c */
 bool xbps_add_obj_to_dict(prop_dictionary_t, prop_object_t, const char *);
 bool xbps_add_obj_to_array(prop_array_t, prop_object_t);
 
@@ -98,13 +99,4 @@ xbps_get_array_iter_from_dict(prop_dictionary_t, const char *);
 bool
 xbps_remove_pkg_dict_from_file(const char *, const char *);
 
-/* Utils */
-int	xbps_install_pkg_deps(prop_dictionary_t);
-int	xbps_install_binary_pkg(const char *, const char *);
-int	xbps_install_binary_pkg_from_repolist(prop_object_t, void *, bool *);
-int	xbps_register_pkg(const char *, const char *, const char *);
-int	xbps_unpack_binary_pkg(prop_dictionary_t, prop_dictionary_t,
-			       int (*cb)(struct archive *, prop_dictionary_t));
-int	xbps_unpack_archive_cb(struct archive *, prop_dictionary_t);
-
 #endif /* !_XBPS_PLIST_H_ */
diff --git a/include/remove.h b/include/remove.h
index 45f521b8f82..60442f405f9 100644
--- a/include/remove.h
+++ b/include/remove.h
@@ -26,6 +26,7 @@
 #ifndef _XBPS_REMOVE_H_
 #define _XBPS_REMOVE_H_
 
+/* From lib/remove.c */
 int	xbps_remove_binary_pkg(const char *, const char *);
 int	xbps_unregister_pkg(const char *);
 
diff --git a/include/repository.h b/include/repository.h
index cf004016a49..deb540f5b4b 100644
--- a/include/repository.h
+++ b/include/repository.h
@@ -26,6 +26,8 @@
 #ifndef _XBPS_REPOSITORY_H_
 #define _XBPS_REPOSITORY_H_
 
+/* From lib/remove.c */
+
 /*
  * (Un)registers a repository specified by an URI from/into the pool.
  *