Removing code and adding some headers to make it compile on SAT Comp'13