fix to compile with refactored headers