Warnings fixed. Unneccesary includes removed.