Removed some includes of 16 bit API.

17 files changed