Fix scons / library headers