Removed includes from CmdConfigDialog.h; needed to add includes to ToolsPlus.h to fix some of the errors.
Added another include to ToolsPlus.h.