compat-3.6.h: Cleanup