diff --git a/login.c b/login.c
index ca84107..e11269b 100644
--- a/login.c
+++ b/login.c
@@ -422,9 +422,9 @@ int func_exec(int argc, char *argv[], int mode)
     xfree(buff);
     if (nargv != NULL) {
       if (!mode)
-        spawnvp(P_WAIT, buf, nargv);
+        spawnvp(P_WAIT, buf, (const char *const *)nargv);
       else
-        execvp(buf, nargv);
+        execvp(buf, (const char *const *)nargv);
     }
     xfree(buf);
   }
diff --git a/nwcrypt.c b/nwcrypt.c
index 8c1bcee..b39d112 100644
--- a/nwcrypt.c
+++ b/nwcrypt.c
@@ -87,8 +87,6 @@ GPL. If anybody who knows more about copyright and sees any problems
 with this, please tell me.
 ****************************************************************************/
 
-#include <string.h>
-
 /******************* Data types ***************************/
 typedef unsigned char buf32[32];
 typedef unsigned char buf16[16];
@@ -120,6 +118,7 @@ static buf32 encryptkeys  =
  0x6B,0x0F,0xD5,0x70,0xAE,0xFB,0xAD,0x11,
  0xF4,0x47,0xDC,0xA7,0xEC,0xCF,0x50,0xC0};
 
+#include <string.h>
 #include "nwcrypt.h"
 static void
 shuffle1(buf32 temp, unsigned char *target)