Try to fix stdint macros again