Remove FCL from public header files