diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4d9235b..5dc061d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,6 +159,8 @@ if(F2003_INTRINSICS)
   target_compile_definitions(mopac-makpol PRIVATE MOPAC_IARGC=command_argument_count)
   target_compile_definitions(mopac-makpol PRIVATE MOPAC_GETARG=get_command_argument)
   if(BUILD_WINMOPAC)
+    target_compile_definitions(mopac-win PRIVATE MOPAC_IARGC=command_argument_count)
+    target_compile_definitions(mopac-win PRIVATE MOPAC_GETARG=get_command_argument)
     target_compile_definitions(mopac-bz PRIVATE MOPAC_IARGC=command_argument_count)
     target_compile_definitions(mopac-bz PRIVATE MOPAC_GETARG=get_command_argument)
   endif()
@@ -170,6 +172,8 @@ else()
   target_compile_definitions(mopac-makpol PRIVATE MOPAC_IARGC=iargc)
   target_compile_definitions(mopac-makpol PRIVATE MOPAC_GETARG=getarg)
   if(BUILD_WINMOPAC)
+    target_compile_definitions(mopac-win PRIVATE MOPAC_IARGC=iargc)
+    target_compile_definitions(mopac-win PRIVATE MOPAC_GETARG=getarg)
     target_compile_definitions(mopac-bz PRIVATE MOPAC_IARGC=iargc)
     target_compile_definitions(mopac-bz PRIVATE MOPAC_GETARG=getarg)
   endif()
diff --git a/src/PARAM/datinp.F90 b/src/PARAM/datinp.F90
index e9536154..49ac2f04 100644
--- a/src/PARAM/datinp.F90
+++ b/src/PARAM/datinp.F90
@@ -70,7 +70,7 @@ subroutine datinp
 !  The weights given to each reference datum depend on the elements present.
 !  Weights are assigned according to the type of element
    double precision, dimension (107) :: element_weights
-   character, external :: get_a_name*300
+   character(len=300), external :: get_a_name
    integer, external :: end_of_keyword
    double precision, external :: seconds, reada
    double precision, parameter :: &
diff --git a/src/PARAM/parkey.F90 b/src/PARAM/parkey.F90
index 5e983d0d..beedb475 100644
--- a/src/PARAM/parkey.F90
+++ b/src/PARAM/parkey.F90
@@ -21,7 +21,7 @@ subroutine parkey (keywrd)
     character (len=*), intent (in) :: keywrd
     integer :: i, j, k
     character :: num*1, line*300
-    character, external :: get_a_name*300
+    character(len=300), external :: get_a_name
     integer, external :: end_of_keyword
     double precision, external :: reada
      if (Index (keywrd, " MNDO ") /= 0) &
diff --git a/src/PARAM/savgeo.F90 b/src/PARAM/savgeo.F90
index e6af90cb..2c84b6c8 100644
--- a/src/PARAM/savgeo.F90
+++ b/src/PARAM/savgeo.F90
@@ -38,7 +38,7 @@ subroutine savgeo (loop, geo, na, nb, nc, xparam, loc)
     character :: num*1
     intrinsic Index
     double precision, external :: reada
-    character, external :: get_a_name*300
+    character(len=300), external :: get_a_name
     save :: iatm, igeo
 !--------------------------------------------------------------------
   !
diff --git a/src/input/wrtkey.F90 b/src/input/wrtkey.F90
index a99f6a0a..49cec594 100644
--- a/src/input/wrtkey.F90
+++ b/src/input/wrtkey.F90
@@ -805,7 +805,7 @@ subroutine wrtcon (allkey)
   integer :: i, ielec, ilevel, j, k, l
   logical :: l_add_H = .false., l_temp
   character :: num*1, num1*1
-  character, external :: get_a_name*300, get_text*300
+  character(len=300), external :: get_a_name, get_text
   integer, external :: end_of_keyword
   logical, external :: myword
   double precision, external :: reada