Tidy up header file requirements for global vars.

Remove some traces from inc handlers

Remove module directory options and configure bits