move typedefs into common.hpp