py: Fix some macros defines; cleanup some includes.