General reshuffling of defines and spacing/brace usage for consistency. In particular: * When defining types, don't mix pointers and non-pointer types on same line to avoid confusion * As much as possible, have all defines at the top of each block instead of scattered haphazardly throughout the code