more includes for knife, across versions