Started isolating include headers from OS specific implementation