Improve build, now it should build on mac and other platforms where include file depend on each other