removing safe_call.h and internal.h references from tools/