Change field type
Remove duplicate includes
Change include path (Missed this one!)