Yes, when I bought my set it came with pop rivets the correct size for headbadges... haven't found any matching ones loose. They do end up long inside, I use a punch and bend it inside the headtube for fork clearance. Nothing wrong with screws either, many builders used em.