Minor fixes (replace explicit exit code by macro, removed extra include directives).
File that is no longer needed was deleted.