part of revert fimc.h ffc changes