cleanup and fix includes