clean up includes and typedefs for edit_distance.hpp