From 6f48016ed8eaa5444f743fb2be33d3f71c5f2caf Mon Sep 17 00:00:00 2001
From: Gerhard Rieger <gerhard@dest-unreach.org>
Date: Sat, 10 Dec 2016 16:21:46 +0100
Subject: [PATCH] Some minor corrections with includes etc.

---
 CHANGES    | 2 ++
 error.c    | 2 +-
 hostan.c   | 1 -
 sysutils.c | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2d81f95..da1702a 100644
--- a/CHANGES
+++ b/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
diff --git a/error.c b/error.c
index 2b615d0..bc60b1e 100644
--- a/error.c
+++ b/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,
diff --git a/hostan.c b/hostan.c
index cce94fe..3a7dc97 100644
--- a/hostan.c
+++ b/hostan.c
@@ -17,7 +17,6 @@
 
 #include "hostan.h"
 
-#include "error.h"
 
 static int iffan(FILE *outfile);
 
diff --git a/sysutils.c b/sysutils.c
index 87f1d52..1a977c2 100644
--- a/sysutils.c
+++ b/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,