Remove dependency on mars.h
Fix typo in versym-cpu patches