Get rid of indirect include of fs_struct.h