Moved some definitions to their proper include file.

11 files changed