Merge "SF/CE: Clean up header dependencies and combine mocks" into main