move defs from forward to define