Also makes the include directories better, instead of depending on the
exact location in this build tree