[SQUASH ME] merged extern "C"s and repaired merge destructions