Try to use forward declarations in headers whenever possible ("class QgsFieldModel;") instead of #include. There are few more places in other new headers.