#22 - Included some OS specific macros