semc-fuji: add missing headers
semc-fuji: fix merge leftovers