Remove extraneous includes + rename desc_