Cleaning up bus.c imported headers