Remove #if/#endif around classes, cleanup mess
Shut up the strict aliasing warning