#include cleanup and reordering #4