Move the inclusion of <debug.h> to individual files and consolidate the inclusion...