[12499] Add some safety to some preprocessor defines
[12500] Remove a few empty lines