Fix include, clean up .o files in ../lib and ../libcli