move definitions into in-source declarations

the last fix wouldn't require any  X macros (requires 2 currently) if
microchip ever decided to update XC32 to GCC > 4.5.