diff --git a/fcst/ft_cmd.c b/fcst/ft_cmd.c
index e14e5346f..a5f2dec4b 100644
--- a/fcst/ft_cmd.c
+++ b/fcst/ft_cmd.c
@@ -14,10 +14,16 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
+#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <scsi/libfc.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
 #include <scsi/fc_encode.h>
+#else
+#include <scsi/fc/fc_ms.h>
+#endif
 #include "fcst.h"
 
 /*
diff --git a/fcst/ft_io.c b/fcst/ft_io.c
index 1ab44f4e5..738fd7a11 100644
--- a/fcst/ft_io.c
+++ b/fcst/ft_io.c
@@ -19,10 +19,16 @@
  * You should have received a copy of the GNU General Public License along with
  * this program.
  */
+
+#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <scsi/libfc.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
 #include <scsi/fc_encode.h>
+#else
+#include <scsi/fc/fc_ms.h>
+#endif
 #include "fcst.h"
 
 /*