Fix strategy and extension includes