Include MachDeps.h in files that use WORD_SIZE_IN_BITS
Remove some extra white space