Fix includes and methods usage