Added use of preprocessor conditionals
Rearranged stdint.h include