The build process is much more beautiful, fixed include files paths along the way