Changed header guard back to original, and removed deprecated enum