Removed #if/#endif around some variable declarations, as they are needed
always.