diff --git a/src/compression_wrapper.c b/src/compression_wrapper.c
index 60e8cbd2..5730b925 100644
--- a/src/compression_wrapper.c
+++ b/src/compression_wrapper.c
@@ -286,7 +286,7 @@ cr_gz_strerror(gzFile f)
 }
 
 #ifdef WITH_ZCHUNK
-cr_ChecksumType
+static cr_ChecksumType
 cr_cktype_from_zck(zckCtx *zck, GError **err)
 {
     int cktype = zck_get_full_hash_type(zck);
diff --git a/src/deltarpms.c b/src/deltarpms.c
index 6a504c66..9e8c5579 100644
--- a/src/deltarpms.c
+++ b/src/deltarpms.c
@@ -625,7 +625,7 @@ typedef struct {
     size_t prefix_len;
 } cr_PrestoDeltaUserData;
 
-void
+static void
 cr_prestodeltatask_free(cr_PrestoDeltaTask *task)
 {
     if (!task)
diff --git a/src/dumper_thread.c b/src/dumper_thread.c
index 00199e2a..b06bebcd 100644
--- a/src/dumper_thread.c
+++ b/src/dumper_thread.c
@@ -421,7 +421,7 @@ get_checksum(const char *filename,
     return checksum;
 }
 
-gchar *
+static gchar *
 prepare_split_media_baseurl(int media_id, const char *location_base)
 {
     // Default location_base "media:" in split mode
diff --git a/src/load_metadata.c b/src/load_metadata.c
index 8fcb37a9..e5df1331 100644
--- a/src/load_metadata.c
+++ b/src/load_metadata.c
@@ -76,13 +76,13 @@ cr_metadata_modulemd(cr_Metadata *md)
 }
 #endif /* WITH_LIBMODULEMD */
 
-void
+static void
 cr_free_values(gpointer data)
 {
     cr_package_free((cr_Package *) data);
 }
 
-GHashTable *
+static GHashTable *
 cr_new_metadata_hashtable()
 {
     GHashTable *hashtable = g_hash_table_new_full(g_str_hash, g_str_equal,
@@ -90,7 +90,7 @@ cr_new_metadata_hashtable()
     return hashtable;
 }
 
-void
+static void
 cr_destroy_metadata_hashtable(GHashTable *hashtable)
 {
     if (hashtable)
diff --git a/src/misc.c b/src/misc.c
index 05fa8a5c..f637432b 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -831,7 +831,7 @@ cr_better_copy_file(const char *src, const char *in_dst, GError **err)
     return TRUE;
 }
 
-int
+static int
 cr_remove_dir_cb(const char *fpath,
                  G_GNUC_UNUSED const struct stat *sb,
                  G_GNUC_UNUSED int typeflag,
diff --git a/src/package.c b/src/package.c
index e62c161a..e472e599 100644
--- a/src/package.c
+++ b/src/package.c
@@ -181,7 +181,7 @@ cr_package_copy(cr_Package *orig)
     return pkg;
 }
 
-void
+__attribute__ ((visibility("hidden"))) void
 cr_package_copy_into(cr_Package *orig, cr_Package *pkg)
 {
     pkg->pkgKey           = orig->pkgKey;
diff --git a/src/repomd.c b/src/repomd.c
index e8fed977..f0b75034 100644
--- a/src/repomd.c
+++ b/src/repomd.c
@@ -113,7 +113,7 @@ cr_repomd_record_copy(const cr_RepomdRecord *orig)
     return rec;
 }
 
-cr_ContentStat *
+static cr_ContentStat *
 cr_get_compressed_content_stat(const char *filename,
                                cr_ChecksumType checksum_type,
                                GError **err)
diff --git a/src/sqlite.c b/src/sqlite.c
index 33bcdccc..515cd713 100644
--- a/src/sqlite.c
+++ b/src/sqlite.c
@@ -1075,7 +1075,7 @@ db_package_ids_write(sqlite3 *db,
 
 // Primary.sqlite interface
 
-void
+static void
 cr_db_destroy_primary_statements(cr_DbPrimaryStatements stmts)
 {
     if (!stmts)
@@ -1105,7 +1105,7 @@ cr_db_destroy_primary_statements(cr_DbPrimaryStatements stmts)
 }
 
 
-cr_DbPrimaryStatements
+static cr_DbPrimaryStatements
 cr_db_prepare_primary_statements(sqlite3 *db, GError **err)
 {
     assert(!err || *err == NULL);
@@ -1193,7 +1193,7 @@ cr_db_prepare_primary_statements(sqlite3 *db, GError **err)
 }
 
 
-void
+static void
 cr_db_add_primary_pkg(cr_DbPrimaryStatements stmts,
                       cr_Package *pkg,
                       GError **err)
@@ -1327,7 +1327,7 @@ cr_db_add_primary_pkg(cr_DbPrimaryStatements stmts,
 // filelists.sqlite interface
 
 
-void
+static void
 cr_db_destroy_filelists_statements(cr_DbFilelistsStatements stmts)
 {
     if (!stmts)
@@ -1341,7 +1341,7 @@ cr_db_destroy_filelists_statements(cr_DbFilelistsStatements stmts)
 }
 
 
-cr_DbFilelistsStatements
+static cr_DbFilelistsStatements
 cr_db_prepare_filelists_statements(sqlite3 *db, GError **err)
 {
     GError *tmp_err = NULL;
@@ -1373,7 +1373,7 @@ cr_db_prepare_filelists_statements(sqlite3 *db, GError **err)
 }
 
 
-void
+static void
 cr_db_add_filelists_pkg(cr_DbFilelistsStatements stmts,
                         cr_Package *pkg,
                         GError **err)
@@ -1414,7 +1414,7 @@ cr_db_add_filelists_pkg(cr_DbFilelistsStatements stmts,
 // other.sqlite interface
 
 
-void
+static void
 cr_db_destroy_other_statements(cr_DbOtherStatements stmts)
 {
     if (!stmts)
@@ -1428,7 +1428,7 @@ cr_db_destroy_other_statements(cr_DbOtherStatements stmts)
 }
 
 
-cr_DbOtherStatements
+static cr_DbOtherStatements
 cr_db_prepare_other_statements(sqlite3 *db, GError **err)
 {
     GError *tmp_err = NULL;
@@ -1460,7 +1460,7 @@ cr_db_prepare_other_statements(sqlite3 *db, GError **err)
 }
 
 
-void
+static void
 cr_db_add_other_pkg(cr_DbOtherStatements stmts, cr_Package *pkg, GError **err)
 {
     int rc;
diff --git a/src/xml_dump.c b/src/xml_dump.c
index 1a488ff0..4553f0e1 100644
--- a/src/xml_dump.c
+++ b/src/xml_dump.c
@@ -116,7 +116,7 @@ cr_latin1_to_utf8(const unsigned char *in, unsigned char *out)
     *out = '\0';
 }
 
-xmlNodePtr
+__attribute__ ((visibility("hidden"))) xmlNodePtr
 cr_xmlNewTextChild(xmlNodePtr parent,
                    xmlNsPtr ns,
                    const xmlChar *name,
@@ -145,7 +145,7 @@ cr_xmlNewTextChild(xmlNodePtr parent,
     return child;
 }
 
-xmlAttrPtr
+__attribute__ ((visibility("hidden"))) xmlAttrPtr
 cr_xmlNewProp(xmlNodePtr node, const xmlChar *name, const xmlChar *orig_content)
 {
     int free_content = 0;
@@ -171,7 +171,7 @@ cr_xmlNewProp(xmlNodePtr node, const xmlChar *name, const xmlChar *orig_content)
     return attr;
 }
 
-void
+__attribute__ ((visibility("hidden")))  void
 cr_xml_dump_files(xmlNodePtr node, cr_Package *package, int primary, gboolean filelists_ext)
 {
     if (!node || !package->files) {
@@ -306,7 +306,7 @@ cr_Package_contains_forbidden_control_chars(cr_Package *pkg)
     return 0;
 }
 
-struct cr_XmlStruct
+static struct cr_XmlStruct
 cr_xml_dump_int(cr_Package *pkg, gboolean filelists_ext, GError **err)
 {
     struct cr_XmlStruct result;
diff --git a/src/xml_dump_deltapackage.c b/src/xml_dump_deltapackage.c
index 1de476f2..cab6ea10 100644
--- a/src/xml_dump_deltapackage.c
+++ b/src/xml_dump_deltapackage.c
@@ -34,7 +34,7 @@
 #define ERR_DOMAIN      CREATEREPO_C_ERROR
 #define INDENT          4
 
-void
+static void
 cr_xml_dump_delta(xmlNodePtr root, cr_DeltaPackage *package)
 {
     /***********************************
diff --git a/src/xml_dump_filelists.c b/src/xml_dump_filelists.c
index 40d6da47..21a01a07 100644
--- a/src/xml_dump_filelists.c
+++ b/src/xml_dump_filelists.c
@@ -31,7 +31,7 @@
 #define ERR_DOMAIN      CREATEREPO_C_ERROR
 
 
-void
+static void
 cr_xml_dump_filelists_items(xmlNodePtr root, cr_Package *package, gboolean filelists_ext)
 {
     /***********************************
@@ -77,7 +77,7 @@ cr_xml_dump_filelists_items(xmlNodePtr root, cr_Package *package, gboolean filel
 }
 
 
-char *
+static char *
 cr_xml_dump_filelists_chunk(cr_Package *package, gboolean filelists_ext, GError **err)
 {
     xmlNodePtr root;
diff --git a/src/xml_dump_other.c b/src/xml_dump_other.c
index 82999f89..21bd94b0 100644
--- a/src/xml_dump_other.c
+++ b/src/xml_dump_other.c
@@ -32,7 +32,7 @@
 #define ERR_DOMAIN      CREATEREPO_C_ERROR
 
 
-void
+static void
 cr_xml_dump_other_changelog(xmlNodePtr root, cr_Package *package)
 {
     if (!package->changelogs) {
@@ -70,7 +70,7 @@ cr_xml_dump_other_changelog(xmlNodePtr root, cr_Package *package)
 }
 
 
-void
+static void
 cr_xml_dump_other_items(xmlNodePtr root, cr_Package *package)
 {
     /***********************************
diff --git a/src/xml_dump_repomd.c b/src/xml_dump_repomd.c
index 0ca22c92..a922595d 100644
--- a/src/xml_dump_repomd.c
+++ b/src/xml_dump_repomd.c
@@ -30,7 +30,7 @@
 #include "xml_dump_internal.h"
 
 
-void
+static void
 cr_xml_dump_repomd_record(xmlNodePtr root, cr_RepomdRecord *rec)
 {
     xmlNodePtr data, node;
@@ -123,7 +123,7 @@ cr_xml_dump_repomd_record(xmlNodePtr root, cr_RepomdRecord *rec)
 }
 
 
-void
+static void
 cr_xml_dump_repomd_body(xmlNodePtr root, cr_Repomd *repomd)
 {
     GSList *element;
diff --git a/src/xml_dump_updateinfo.c b/src/xml_dump_updateinfo.c
index 1c83fa7b..5f27780a 100644
--- a/src/xml_dump_updateinfo.c
+++ b/src/xml_dump_updateinfo.c
@@ -32,7 +32,7 @@
 #define ERR_DOMAIN      CREATEREPO_C_ERROR
 #define INDENT          2
 
-void
+static void
 cr_xml_dump_updatecollectionpackages(xmlNodePtr collection, GSList *packages)
 {
     for (GSList *elem = packages; elem; elem = g_slist_next(elem)) {
@@ -69,7 +69,7 @@ cr_xml_dump_updatecollectionpackages(xmlNodePtr collection, GSList *packages)
     }
 }
 
-void
+static void
 cr_xml_dump_updatecollectionmodule(xmlNodePtr collection, cr_UpdateCollectionModule *module)
 {
     if (!module)
@@ -87,7 +87,7 @@ cr_xml_dump_updatecollectionmodule(xmlNodePtr collection, cr_UpdateCollectionMod
     cr_xmlNewProp_c(xml_module, BAD_CAST "arch", BAD_CAST module->arch);
 }
 
-void
+static void
 cr_xml_dump_updateinforecord_pkglist(xmlNodePtr update, GSList *collections)
 {
     xmlNodePtr pkglist;
@@ -111,7 +111,7 @@ cr_xml_dump_updateinforecord_pkglist(xmlNodePtr update, GSList *collections)
     }
 }
 
-void
+static void
 cr_xml_dump_updateinforecord_references(xmlNodePtr update, GSList *refs)
 {
     xmlNodePtr references;
@@ -129,7 +129,7 @@ cr_xml_dump_updateinforecord_references(xmlNodePtr update, GSList *refs)
     }
 }
 
-xmlNodePtr
+static xmlNodePtr
 cr_xml_dump_updateinforecord_internal(xmlNodePtr root, cr_UpdateRecord *rec)
 {
     xmlNodePtr update, node;
@@ -182,7 +182,7 @@ cr_xml_dump_updateinforecord_internal(xmlNodePtr root, cr_UpdateRecord *rec)
 }
 
 
-void
+static void
 cr_xml_dump_updateinfo_body(xmlNodePtr root, cr_UpdateInfo *ui)
 {
     GSList *element;
diff --git a/src/xml_file.c b/src/xml_file.c
index 44b38f9b..834c20b8 100644
--- a/src/xml_file.c
+++ b/src/xml_file.c
@@ -119,7 +119,7 @@ cr_xmlfile_set_num_of_pkgs(cr_XmlFile *f, long num, GError **err)
     return CRE_OK;
 }
 
-int
+static int
 cr_xmlfile_write_xml_header(cr_XmlFile *f, GError **err)
 {
     const char *xml_header;
@@ -166,7 +166,7 @@ cr_xmlfile_write_xml_header(cr_XmlFile *f, GError **err)
     return cr_end_chunk(f->f, err);
 }
 
-int
+static int
 cr_xmlfile_write_xml_footer(cr_XmlFile *f, GError **err)
 {
     const char *xml_footer;
diff --git a/src/xml_parser.c b/src/xml_parser.c
index 6ae83dd5..31c579a6 100644
--- a/src/xml_parser.c
+++ b/src/xml_parser.c
@@ -29,7 +29,7 @@
 #define ERR_DOMAIN      CREATEREPO_C_ERROR
 
 
-cr_ParserData *
+__attribute__ ((visibility("hidden"))) cr_ParserData *
 cr_xml_parser_data(unsigned int numstates)
 {
     cr_ParserData *pd = g_new0(cr_ParserData, 1);
@@ -41,7 +41,7 @@ cr_xml_parser_data(unsigned int numstates)
     return pd;
 }
 
-void
+__attribute__ ((visibility("hidden"))) void
 cr_xml_parser_data_free(cr_ParserData *pd)
 {
     if (!pd) {
@@ -56,7 +56,7 @@ cr_xml_parser_data_free(cr_ParserData *pd)
     g_free(pd);
 }
 
-void
+__attribute__ ((visibility("hidden"))) void
 cr_char_handler(void *pdata, const xmlChar *s, int len)
 {
     int l;
@@ -82,7 +82,7 @@ cr_char_handler(void *pdata, const xmlChar *s, int len)
     *c = '\0';
 }
 
-int
+__attribute__ ((visibility("hidden"))) int
 cr_xml_parser_warning(cr_ParserData *pd,
                       cr_XmlParserWarningType type,
                       const char *msg,
@@ -121,7 +121,7 @@ cr_xml_parser_warning(cr_ParserData *pd,
     return ret;
 }
 
-gint64
+__attribute__ ((visibility("hidden"))) gint64
 cr_xml_parser_strtoll(cr_ParserData *pd,
                       const char *nptr,
                       unsigned int base)
@@ -147,7 +147,7 @@ cr_xml_parser_strtoll(cr_ParserData *pd,
     return val;
 }
 
-int
+__attribute__ ((visibility("hidden"))) int
 cr_newpkgcb(cr_Package **pkg,
             G_GNUC_UNUSED const char *pkgId,
             G_GNUC_UNUSED const char *name,
@@ -163,7 +163,7 @@ cr_newpkgcb(cr_Package **pkg,
     return CR_CB_RET_OK;
 }
 
-int
+__attribute__ ((visibility("hidden"))) int
 cr_xml_parser_generic(xmlParserCtxtPtr parser,
                       cr_ParserData *pd,
                       const char *path,
@@ -240,7 +240,7 @@ cr_xml_parser_generic(xmlParserCtxtPtr parser,
     return ret;
 }
 
-int
+__attribute__ ((visibility("hidden"))) int
 cr_xml_parser_generic_from_string(xmlParserCtxtPtr parser,
                                   cr_ParserData *pd,
                                   const char *xml_string,
@@ -293,7 +293,7 @@ cr_xml_parser_generic_from_string(xmlParserCtxtPtr parser,
     return ret;
 }
 
-const xmlChar **
+__attribute__ ((visibility("hidden"))) const xmlChar **
 unescape_ampersand_from_values(const xmlChar **attr, gboolean *allocation_needed) {
     *allocation_needed = FALSE;
 
diff --git a/src/xml_parser_filelists.c b/src/xml_parser_filelists.c
index 41baf6f0..548256c2 100644
--- a/src/xml_parser_filelists.c
+++ b/src/xml_parser_filelists.c
@@ -318,7 +318,7 @@ cr_end_handler(void *pdata, G_GNUC_UNUSED const xmlChar *element)
     }
 }
 
-cr_ParserData *
+__attribute__ ((visibility("hidden"))) cr_ParserData *
 filelists_parser_data_new(cr_XmlParserNewPkgCb newpkgcb,
                           void *newpkgcb_data,
                           cr_XmlParserPkgCb pkgcb,
@@ -359,7 +359,7 @@ filelists_parser_data_new(cr_XmlParserNewPkgCb newpkgcb,
     return pd;
 }
 
-int
+static int
 cr_xml_parse_filelists_internal(const char *target,
                                 cr_XmlParserNewPkgCb newpkgcb,
                                 void *newpkgcb_data,
diff --git a/src/xml_parser_other.c b/src/xml_parser_other.c
index a5d8afa8..62cdf358 100644
--- a/src/xml_parser_other.c
+++ b/src/xml_parser_other.c
@@ -284,7 +284,7 @@ cr_end_handler(void *pdata, G_GNUC_UNUSED const xmlChar *element)
     }
 }
 
-cr_ParserData *
+__attribute__ ((visibility("hidden"))) cr_ParserData *
 other_parser_data_new(cr_XmlParserNewPkgCb newpkgcb,
                       void *newpkgcb_data,
                       cr_XmlParserPkgCb pkgcb,
@@ -325,7 +325,7 @@ other_parser_data_new(cr_XmlParserNewPkgCb newpkgcb,
     return pd;
 }
 
-int
+static int
 cr_xml_parse_other_internal(const char *target,
                             cr_XmlParserNewPkgCb newpkgcb,
                             void *newpkgcb_data,
diff --git a/src/xml_parser_primary.c b/src/xml_parser_primary.c
index a98ecf92..164e5f13 100644
--- a/src/xml_parser_primary.c
+++ b/src/xml_parser_primary.c
@@ -665,7 +665,7 @@ cr_end_handler(void *pdata, G_GNUC_UNUSED const xmlChar *element)
     }
 }
 
-cr_ParserData *
+__attribute__ ((visibility("hidden"))) cr_ParserData *
 primary_parser_data_new(cr_XmlParserNewPkgCb newpkgcb,
                         void *newpkgcb_data,
                         cr_XmlParserPkgCb pkgcb,
@@ -708,7 +708,7 @@ primary_parser_data_new(cr_XmlParserNewPkgCb newpkgcb,
     return pd;
 }
 
-int
+static int
 cr_xml_parse_primary_internal(const char *target,
                               cr_XmlParserNewPkgCb newpkgcb,
                               void *newpkgcb_data,