Fixed include macros names, they were violating the standard