Get rid of the extra schema includes to expressions.

This causes build errors when using Mars.

Change-Id: I5b7aaa261e252b7aa7a2afe5a86398c4f24af0aa
Reviewed-on: https://git.eclipse.org/r/38174
Reviewed-by: Doug Schaefer <dschaefer@qnx.com>
Tested-by: Doug Schaefer <dschaefer@qnx.com>