Various bullet code cleanup - made bullet code style at least a TAD more consistent.
Moved some includes around.