Add files to Protobuild definitons.
Some improvements and tweaks.