Fix includes
Add checker.