Merged font.h and path.h into gdi.h. Moved x11font.h to dlls/x11drv. Removed a number of unnecessary #includes.