Merge "Add missing assert.h and functional includes"