Fixed header include and forward dec