diff --git a/num/make/makefile_base b/num/make/makefile_base
index fc6e43232..32b1569c3 100644
--- a/num/make/makefile_base
+++ b/num/make/makefile_base
@@ -69,26 +69,21 @@ nodeps : $(.DEFAULT_GOAL)
 #
 # COMPULATION RULES
 
-#COMPILE_LEGACY = $(filter-out -std=f2008, $(COMPILE_TO_TEST))
-COMPILE_LEGACY = $(filter-out -std=f2008, $(COMPILE_TO_DEPLOY)) -std=legacy
+COMPILE = $(COMPILE_TO_DEPLOY) $(FCfixed)
 
-COMPILE = $(COMPILE_LEGACY) $(FCfixed)
-
-COMPILE_FREE = $(COMPILE_LEGACY) $(FCfree)
+COMPILE_FREE = $(COMPILE_TO_DEPLOY) $(FCfree)
 
 #COMPILE_XTRA = $(COMPILE_NO_CHECKS) $(FCfixed) -c
 COMPILE_XTRA = $(COMPILE_BASIC) $(FCopt) $(FCfixed) -c
 
-COMPILE_LEGACY_XTRA = $(filter-out -std=f2008, $(COMPILE_XTRA)) -std=legacy
-
 COMPILE_CMD = $(COMPILE)
 
 mod_bobyqa.o mod_newuoa.o mod_dop853.o mod_dopri5.o mod_dc_decsol.o mod_rosenbrock.o : %.o : %.f
 ifneq ($(QUIET),)
-	@echo COMPILE_LEGACY_XTRA $<
-	@$(COMPILE_LEGACY_XTRA) $<
+	@echo COMPILE_XTRA $<
+	@$(COMPILE_XTRA) $<
 else
-	$(COMPILE_LEGACY_XTRA) $<
+	$(COMPILE_XTRA) $<
 endif
 
 %.o : %.mod
diff --git a/num/private/decomc.dek b/num/private/decomc.dek
index 8fd2bdf15..685ef4a59 100644
--- a/num/private/decomc.dek
+++ b/num/private/decomc.dek
@@ -10,6 +10,10 @@
 #include "mtx_decsolc.dek"
 #include "mtx_decsolcs.dek"
       end interface
+      integer :: m1, m2, nm1, lde1, ijob
+      integer :: mle, mue, mbjac, mbb, mdiag, mdiff, mbdiag
+      integer :: nzmax, isparse, lcd, lrd, lid
+      integer :: ierr, ip2(nm1), n, ldjac, ldmas, mlmas, mumas
       integer :: ia(*), ja(nzmax)  ! ia(n+1) when used; ia(2) when not.
       double precision :: sparse_jac(nzmax)
       double precision :: sar(nzmax), sai(nzmax)
@@ -19,10 +23,6 @@
       double precision :: fjac(ldjac,n), fmas(ldmas,nm1)
       double precision :: e2r(lde1,nm1), e2i(lde1,nm1)
       double precision :: br(n), bi(n), alphn, betan
-      integer :: ierr, ip2(nm1), n, ldjac, ldmas, mlmas, mumas
-      integer :: m1, m2, nm1, lde1, ijob
-      integer :: mle, mue, mbjac, mbb, mdiag, mdiff, mbdiag
-      integer :: nzmax, isparse, lcd, lrd, lid
       
       ! LOCALS
       integer :: i, j, k, jm1, mm, imle, ib, hint
@@ -313,6 +313,10 @@
 #include "mtx_decsolc.dek"
 #include "mtx_decsolcs.dek"
       end interface
+      integer :: m1, m2, nm1, lde1, ijob
+      integer :: mle, mue, mbjac, mbb, mdiag, mdiff, mbdiag
+      integer :: nzmax, isparse, lcd, lrd, lid
+      integer :: ierr, ip2(nm1), n, ldjac, ldmas, mlmas, mumas
       integer :: ia(:) ! (n+1)
       integer :: ja(:) ! (nzmax)
       real(dp) :: sparse_jac(:) ! (nzmax)
@@ -328,10 +332,6 @@
       
       double precision :: br(n), bi(n), alphn, betan
       
-      integer :: ierr, ip2(nm1), n, ldjac, ldmas, mlmas, mumas
-      integer :: m1, m2, nm1, lde1, ijob
-      integer :: mle, mue, mbjac, mbb, mdiag, mdiff, mbdiag
-      integer :: nzmax, isparse, lcd, lrd, lid
 
 
       goto (1,2,3,4,5,6,55,8,9,55,11,12,13,14,15), ijob
diff --git a/num/private/estrad.dek b/num/private/estrad.dek
index 6094819fe..a64e3e991 100644
--- a/num/private/estrad.dek
+++ b/num/private/estrad.dek
@@ -11,6 +11,10 @@
 #include "mtx_decsol.dek"
 #include "mtx_decsols.dek"
       end interface
+      integer, pointer :: ip1(:) ! (nm1)
+      integer :: n, iphes(n), nerror, ldjac, mljac, mujac, ldmas, mlmas, mumas
+      integer :: nfcn, ijob, m1, m2, nm1, lde1, lrpar, lipar, ier, mle, mue
+      integer :: mbjac, mbb, mdiag, mdiff, mbdiag, nzmax, isparse, lrd, lid
       integer :: ia(:) ! (n+1)
       integer :: ja(:) ! (nzmax)
       double precision :: sa(nzmax)
@@ -19,10 +23,6 @@
       integer, intent(inout), pointer :: ipar(:) ! (lipar)
       real(dp), intent(inout), pointer :: rpar(:) ! (lrpar)
       
-      integer, pointer :: ip1(:) ! (nm1)
-      integer :: iphes(n), n, nerror, ldjac, mljac, mujac, ldmas, mlmas, mumas
-      integer :: nfcn, ijob, m1, m2, nm1, lde1, lrpar, lipar, ier, mle, mue
-      integer :: mbjac, mbb, mdiag, mdiff, mbdiag, nzmax, isparse, lrd, lid
       double precision :: fjac(ldjac,n), fmas(ldmas,nm1)
       double precision, pointer :: e1_1D(:)
       double precision :: x, scal(n), y0(n), y(n)
diff --git a/num/private/slvrad.dek b/num/private/slvrad.dek
index ebe4d7f24..53c2e9373 100644
--- a/num/private/slvrad.dek
+++ b/num/private/slvrad.dek
@@ -11,6 +11,9 @@
 #include "mtx_decsolc.dek"
 #include"mtx_decsolcs.dek"
       end interface
+      integer :: ldjac, mljac, mujac, ldmas, mlmas, mumas, m1, m2, nm1, lde1, ier, ijob
+      integer :: n, mle, mue, mbjac, mbb, mdiag, mdiff, mbdiag, nzmax, isparse, lcd, lrd, lid
+      integer :: iphes(n)
       integer :: ia(:) ! (n+1)
       integer :: ja(:) ! (nzmax)
       double precision :: sa(nzmax), sar(nzmax), sai(nzmax)
@@ -21,9 +24,6 @@
       double precision, pointer :: e1_1D(:)
       double precision :: e2r(lde1,nm1), e2i(lde1,nm1), cont(n)
       double precision, pointer, dimension(:) :: z1, z2, z3, f1, f2, f3 ! (n)
-      integer :: ldjac, mljac, mujac, ldmas, mlmas, mumas, m1, m2, nm1, lde1, ier, ijob
-      integer :: n, mle, mue, mbjac, mbb, mdiag, mdiff, mbdiag, nzmax, isparse, lcd, lrd, lid
-      integer :: iphes(n)
       integer, pointer, dimension(:) :: ip1, ip2 ! (nm1)