Fix build system (header dependencies)