cleanup forward.hpp to reduce dependencies