Cleanup some twice included header