-static void addon_alias_uid( addon_alias *alias, char buf[76] );
-VG_STATIC void addon_mount_content_folder( enum addon_type type,
+static int addon_alias_eq( addon_alias *a, addon_alias *b );
+static void addon_alias_uid( addon_alias *alias, char buf[ADDON_UID_MAX] );
+static int addon_uid_to_alias( char uid[ADDON_UID_MAX], addon_alias *alias );
+static void invalidate_addon_alias( addon_alias *alias );
+static void addon_mount_content_folder( enum addon_type type,