* Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 svn path=/trunk/; revision=61878