Header/implementation switch fix