fixed some includes and property definitions