editor: whoops, fix error-path
editor: clean up includes a tad