Add missing namespace delcaration
Add missing ifdef