Add missing spaces
Fix wrong include guard names