Some minor corrections with includes etc.

CHANGES

@@ -12,6 +12,8 @@ corrections:
 
 	Socat hung when configured with --disable-sycls.
 
+	Some minor corrections with includes etc.
+
 porting:
 	Type conflict between int and sig_atomic_t between declaration and
 	definition of diag_immediate_type and diag_immediate_exit broke

error.c

@@ -14,9 +14,9 @@
 #include "snprinterr.h"
 
 #include "error.h"
-#include "sysincludes.h"
 #include "sycls.h"
 
+
 /* translate MSG level to SYSLOG level */
 int syslevel[] = {
    LOG_DEBUG,

hostan.c

@@ -17,7 +17,6 @@
 
 #include "hostan.h"
 
-#include "error.h"
 
 static int iffan(FILE *outfile);
 

sysutils.c

@@ -711,7 +711,7 @@ int xiosetenv(const char *varname, const char *value, int overwrite, const char
    l += 1;
    strncat(envname+l, varname, XIO_ENVNAMELEN-l-1);
    return _xiosetenv(envname, value, overwrite, sep);
-#  undef ENVNAMELEN
+#  undef XIO_ENVNAMELEN
 }
 
 int xiosetenv2(const char *varname, const char *varname2, const char *value,