diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64ab77103..3448335cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -334,6 +334,7 @@ set (wsjt_FSRCS
   lib/chkmsg.f90
   lib/chkss2.f90
   lib/coord.f90
+  lib/fsk4hf/cpolyfit.f90
   lib/db.f90
   lib/decode4.f90
   lib/decode65a.f90
@@ -389,6 +390,8 @@ set (wsjt_FSRCS
   lib/genmsk144.f90
   lib/genmsk40.f90
   lib/fsk4hf/genmskhf.f90
+  lib/fsk4hf/getfc1.f90
+  lib/fsk4hf/getfc2.f90
   lib/genqra64.f90
   lib/genwspr.f90
   lib/geodist.f90
@@ -437,6 +440,7 @@ set (wsjt_FSRCS
   lib/msk144sim.f90
   lib/fsk4hf/mskhfsim.f90
   lib/mskrtd.f90
+  lib/fsk4hf/msksoftsym.f90
   lib/pctile.f90
   lib/peakdt9.f90
   lib/peakup.f90
diff --git a/lib/fsk4hf/mskhfsim.f90 b/lib/fsk4hf/mskhfsim.f90
index a929ee8c6..8d64791b7 100644
--- a/lib/fsk4hf/mskhfsim.f90
+++ b/lib/fsk4hf/mskhfsim.f90
@@ -146,7 +146,8 @@ program msksim
         call cpolyfit(c,pp,id,maxn,aa,bb,zz)
         nterms=maxn
 
-        call msksoftsym(zz,aa,bb,id,nterms,ierror,rxdata)
+        call msksoftsym(zz,aa,bb,id,nterms,ierror,rxdata,nhard0,nhard,   &
+             nhardsync0,nhardsync)
         
 !---------------------------------------------------------------- Decode
         rxav=sum(rxdata)/ND
@@ -186,8 +187,3 @@ program msksim
   enddo
 
 999 end program msksim
-
-  include 'getfc1.f90'
-  include 'getfc2.f90'
-  include 'cpolyfit.f90'
-  include 'msksoftsym.f90'
diff --git a/lib/fsk4hf/msksoftsym.f90 b/lib/fsk4hf/msksoftsym.f90
index fa1d965bf..ac844d017 100644
--- a/lib/fsk4hf/msksoftsym.f90
+++ b/lib/fsk4hf/msksoftsym.f90
@@ -1,4 +1,5 @@
-subroutine msksoftsym(zz,aa,bb,id,nterms,ierror,rxdata)
+subroutine msksoftsym(zz,aa,bb,id,nterms,ierror,rxdata,nhard0,nhard,   &
+     nhardsync0,nhardsync)
 
   parameter (KK=84)                     !Information bits (72 + CRC12)
   parameter (ND=168)                    !Data symbols: LDPC (168,84), r=1/2