Fix package declarations that were accidentally removed