Cleaned up DEBUG build

Made the DEBUG build work (not dependent on MFC headers that were
removed).  Fixed an include file path.