Removed arg.h dependencies