* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716
svn path=/trunk/; revision=61528
* Implement LoadSettings() and SaveSettings(). Patch by Edijs Kolesnikovics with some minor changes by me.
See issue #6925 for more details.
svn path=/trunk/; revision=56382