Abandon defs.h and some files;