Fixed wrong definition of header classes and fixed and added includes