Index: mcpp-2.7.2.1/src/system.c
===================================================================
--- mcpp-2.7.2.1.orig/src/system.c
+++ mcpp-2.7.2.1/src/system.c
@@ -43,6 +43,8 @@
 #include    "internal.H"
 #endif
 
+#include <unistd.h>
+
 #if     HOST_SYS_FAMILY == SYS_UNIX
 #include    "unistd.h"              /* For getcwd(), readlink() */
 #elif   HOST_COMPILER == MSC || HOST_COMPILER == LCC
Index: mcpp-2.7.2.1/src/expand.c
===================================================================
--- mcpp-2.7.2.1.orig/src/expand.c
+++ mcpp-2.7.2.1/src/expand.c
@@ -710,7 +710,8 @@ static char *   replace(
         } else {
             m_inf->locs.start_col = m_inf->locs.start_line = 0L;
         }
-        m_inf->args = m_inf->loc_args = NULL;       /* Default args */
+        m_inf->args = NULL;                /* Default args */
+        m_inf->loc_args = NULL;
         for (num = 1, recurs = 0; num < m_num; num++)
             if (mac_inf[ num].defp == defp)
                 recurs++;           /* Recursively nested macro     */