Fix "make distclean", which should fix some of the build issues from last night