- (bal) Part two.. Drop unused AIX header, fix up missing char *cp.  All
   that is left is handling aix_usrinfo().
diff --git a/session.c b/session.c
index 674ff58..be6843a 100644
--- a/session.c
+++ b/session.c
@@ -57,10 +57,6 @@
 #include "canohost.h"
 #include "session.h"
 
-#if defined(HAVE_USERSEC_H)
-#include <usersec.h>
-#endif
-
 #ifdef HAVE_CYGWIN
 #include <windows.h>
 #include <sys/cygwin.h>
@@ -968,11 +964,15 @@
 		    original_command);
 
 #ifdef _AIX
-	if ((cp = getenv("AUTHSTATE")) != NULL)
-		child_set_env(&env, &envsize, "AUTHSTATE", cp);
-	if ((cp = getenv("KRB5CCNAME")) != NULL)
-		child_set_env(&env, &envsize, "KRB5CCNAME", cp);
-	read_environment_file(&env, &envsize, "/etc/environment");
+	{
+		char *cp;
+
+		if ((cp = getenv("AUTHSTATE")) != NULL)
+			child_set_env(&env, &envsize, "AUTHSTATE", cp);
+		if ((cp = getenv("KRB5CCNAME")) != NULL)
+			child_set_env(&env, &envsize, "KRB5CCNAME", cp);
+		read_environment_file(&env, &envsize, "/etc/environment");
+	}
 #endif
 #ifdef KRB4
 	if (s->authctxt->krb4_ticket_file)