(Griffin) Move more includes into Griffin