cleaned up registry headers conditional compilations