Removed duplicate defines from headers