revert last changes and fix an include (ಠ⌣ಠ)