Added __eq__, cleaned up includes & defines