Add src/models to INCLUDEPATH
Fix missing #includes