Fixed proper build system and correct includes