Undo fs*.h workaround