Removing the naginclude headers - they cause more confusion than convenience at this point.