diff --git a/src/cenv.h b/src/cenv.h
index c16b239..88eb474 100644
--- a/src/cenv.h
+++ b/src/cenv.h
@@ -37,10 +37,9 @@
 **	CENV_SYS_x  = target OS
 **	CENV_SYSF_x = target OS features 
 **
-** Note that the CPU and SYS are expected to be explicitly specified by
-** a command line definition.  If no setting is detected this code tries
-** a few simple checks, but it is not an error if nothing is set; the
-** includer may have portable defaults.
+** Note that most of the definitions in this file are, or should be,
+** obsolete. Where still relevant, they should be detected by the
+** configure script.
 */
 
 #ifndef CENV_INCLUDED
diff --git a/src/dpchaos.c b/src/dpchaos.c
index acba554..adb50a6 100644
--- a/src/dpchaos.c
+++ b/src/dpchaos.c
@@ -68,6 +68,8 @@ are completely independent.
 // Make sure short construction by | is from known network order, otherwise use casting.
 // Try to check ARP best practices (e.g retrans intervals?)
 
+#include "klh10.h"	/* Get config params */
+
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -76,8 +78,6 @@ are completely independent.
 
 #include <arpa/inet.h>
 
-#include "klh10.h"	/* Get config params */
-
 /* This must precede any other OSD includes to ensure that DECOSF gets
    the right flavor sockaddr (sigh)
 */
diff --git a/src/dpimp.c b/src/dpimp.c
index 85060c8..f673d51 100644
--- a/src/dpimp.c
+++ b/src/dpimp.c
@@ -208,14 +208,14 @@ default for every OS that implements /dev/tun.
 
 */
 
+#include "klh10.h"	/* Get config params */
+
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdarg.h>
 
-#include "klh10.h"	/* Get config params */
-
 /* This must precede any other OSD includes to ensure that DECOSF gets
    the right flavor sockaddr (sigh)
 */
diff --git a/src/dpni20.c b/src/dpni20.c
index 358c52c..b49d9a8 100644
--- a/src/dpni20.c
+++ b/src/dpni20.c
@@ -144,6 +144,8 @@ The following general situations are possible:
 			(Unsure yet if Solaris needs this)
 */
 
+#include "klh10.h"	/* For config params */
+
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
@@ -152,8 +154,6 @@ The following general situations are possible:
 #include <poll.h>	/* For NetBSD mainly */
 
 
-#include "klh10.h"	/* For config params */
-
 /* This must precede any other OSD includes to ensure that DECOSF gets
    the right flavor sockaddr (sigh)
 */
diff --git a/src/dprpxx.c b/src/dprpxx.c
index 2635864..beeb504 100644
--- a/src/dprpxx.c
+++ b/src/dprpxx.c
@@ -39,13 +39,14 @@ size, and configuration.
 
 */
 
+#include "klh10.h"	/* For config params */
+
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdlib.h>	/* For malloc */
 #include <stdarg.h>
 
-#include "klh10.h"	/* For config params */
 #include "word10.h"
 #include "dpsup.h"		/* General DP defs */
 #include "dprpxx.h"		/* RPXX specific defs */
diff --git a/src/dptm03.c b/src/dptm03.c
index 14f03da..2a03a20 100644
--- a/src/dptm03.c
+++ b/src/dptm03.c
@@ -207,14 +207,14 @@ So, algorithm (on DECOSF anyway) should be:
 			should remain HARDON.
 */
 
+#include "klh10.h"	/* For config params */
+
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdarg.h>
 
-#include "klh10.h"	/* For config params */
-
 #if CENV_SYS_UNIX
 # include <unistd.h>
 # include <sys/types.h>
diff --git a/src/dvcty.c b/src/dvcty.c
index 0c493e4..da91474 100644
--- a/src/dvcty.c
+++ b/src/dvcty.c
@@ -25,9 +25,10 @@
  *
  */
 
+#include "klh10.h"
+
 #include <stdio.h>
 
-#include "klh10.h"
 #include "kn10def.h"
 #include "kn10ops.h"
 #include "fecmd.h"
diff --git a/src/dvlites.c b/src/dvlites.c
index b5b9b12..c0a471e 100644
--- a/src/dvlites.c
+++ b/src/dvlites.c
@@ -20,9 +20,10 @@
 **  and is used by permission.  
 */
 
+#include "klh10.h"
+
 #include <stdio.h>
 #include <string.h>
-#include "klh10.h"
 
 #if !KLH10_DEV_LITES && CENV_SYS_DECOSF
 	/* Stupid gubbish needed to prevent OSF/1 AXP compiler from
diff --git a/src/enaddr.c b/src/enaddr.c
index c8809e8..a6776a9 100644
--- a/src/enaddr.c
+++ b/src/enaddr.c
@@ -50,13 +50,14 @@
 				+AB:0:0:2:0:0
 */
 
+#include "cenv.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 
-#include "cenv.h"
 #include "rcsid.h"
 #include "osdnet.h"
 
diff --git a/src/fecmd.c b/src/fecmd.c
index a5327fc..dff4914 100644
--- a/src/fecmd.c
+++ b/src/fecmd.c
@@ -25,6 +25,8 @@
  *
  */
 
+#include "klh10.h"
+
 #include <stdio.h>
 #include <stdlib.h>	/* Malloc and friends */
 #include <string.h>
@@ -34,7 +36,6 @@
 #include <time.h>
 #include <stdarg.h>	/* For error-reporting functions */
 
-#include "klh10.h"
 #include "kn10mac.h"	/* FLD macros */
 #include "kn10def.h"
 #include "kn10dev.h"
diff --git a/src/inexts.c b/src/inexts.c
index bb59127..cc61387 100644
--- a/src/inexts.c
+++ b/src/inexts.c
@@ -28,8 +28,8 @@
 
 /* See CODING.TXT for guidelines to coding instruction routines. */
 
-#include <stddef.h>
 #include "klh10.h"
+#include <stddef.h>
 #include "kn10def.h"	/* Machine defs */
 #include "kn10ops.h"	/* PDP-10 ops */
 
diff --git a/src/klh10.c b/src/klh10.c
index 62d5c6b..adfd7cc 100644
--- a/src/klh10.c
+++ b/src/klh10.c
@@ -38,6 +38,8 @@
  *
  */
 
+#include "klh10.h"
+
 #include <stdio.h>
 #include <stdlib.h>	/* Malloc and friends */
 #include <string.h>
@@ -47,7 +49,6 @@
 #include <time.h>
 #include <stdarg.h>	/* For error-reporting functions */
 
-#include "klh10.h"
 #include "kn10mac.h"	/* FLD macros */
 #include "kn10def.h"
 #include "kn10dev.h"
diff --git a/src/kn10cpu.c b/src/kn10cpu.c
index 1f434c5..9edb559 100644
--- a/src/kn10cpu.c
+++ b/src/kn10cpu.c
@@ -37,10 +37,11 @@
  *
  */
 
+#include "klh10.h"
+
 #include <stdio.h>
 #include <setjmp.h>	/* For setjmp, longjmp */
 
-#include "klh10.h"
 #include "osdsup.h"
 #include "kn10def.h"
 #include "kn10ops.h"
diff --git a/src/kn10dev.c b/src/kn10dev.c
index 2b087eb..34791c6 100644
--- a/src/kn10dev.c
+++ b/src/kn10dev.c
@@ -27,12 +27,13 @@
 ** definition that is used to help initialize other devices.
 */
 
+#include "klh10.h"
+
 #include <stdio.h>	/* For stderr */
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>	/* For malloc/free */
 
-#include "klh10.h"
 #include "osdsup.h"
 #include "kn10def.h"
 #include "kn10dev.h"
diff --git a/src/kn10pag.c b/src/kn10pag.c
index 77ece4c..23343f4 100644
--- a/src/kn10pag.c
+++ b/src/kn10pag.c
@@ -25,10 +25,11 @@
  *
  */
 
+#include "klh10.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "klh10.h"
 #include "osdsup.h"
 #include "kn10def.h"
 #include "kn10ops.h"
diff --git a/src/opdata.c b/src/opdata.c
index e8584b0..6473e0e 100644
--- a/src/opdata.c
+++ b/src/opdata.c
@@ -24,10 +24,11 @@
 
 #define EXTDEF		/* Definitions, not declarations! */
 
+#include "klh10.h"
+
 #include <stddef.h>	/* For NULL */
 #include <stdio.h>	/* For op_init error reporting */
 
-#include "klh10.h"
 #include "kn10def.h"
 #include "opdefs.h"
 
diff --git a/src/osdsup.c b/src/osdsup.c
index 62abbec..8b182b7 100644
--- a/src/osdsup.c
+++ b/src/osdsup.c
@@ -43,11 +43,12 @@
  *
  */
 
+#include "klh10.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>	/* For strrchr */
 
-#include "klh10.h"
 #include "kn10def.h"
 #include "osdsup.h"
 #include "kn10ops.h"
diff --git a/src/prmstr.c b/src/prmstr.c
index 96224d1..fc39c63 100644
--- a/src/prmstr.c
+++ b/src/prmstr.c
@@ -27,6 +27,8 @@
 ** hence must avoid any dependencies on other code.
 */
 
+#include "cenv.h"	/* Just in case of LFS */
+
 #include <stdio.h>
 #include <stdlib.h>	/* Malloc and friends */
 #include <string.h>
diff --git a/src/tapedd.c b/src/tapedd.c
index beca2ee..02f3a57 100644
--- a/src/tapedd.c
+++ b/src/tapedd.c
@@ -46,6 +46,8 @@
 ** this; OSDTAP.C could complete it.
 */
 
+#include "cenv.h"
+
 #include <string.h>
 #include <fcntl.h>
 #include <signal.h>
diff --git a/src/udlconv.c b/src/udlconv.c
index 28f0694..fb7eff5 100644
--- a/src/udlconv.c
+++ b/src/udlconv.c
@@ -162,6 +162,8 @@ Lisp format, the -right- thing to do is to do this all from Maclisp!
 
 */
 
+#include "cenv.h"
+
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/src/uexbconv.c b/src/uexbconv.c
index 521b906..6ed3be5 100644
--- a/src/uexbconv.c
+++ b/src/uexbconv.c
@@ -59,6 +59,8 @@ and output as bytes in the following order by the code at SAVGRC:
 <jrst>,,<saddr> => 0,,<addr> =>	<xxxx><B3><B2><B1><B0>	hi 4 bits dropped
 
 */
+#include "cenv.h"	/* Just in case of LFS */
+
 #include <stdio.h>
 
 #include "word10.h"
diff --git a/src/vdisk.c b/src/vdisk.c
index 5c745f1..3f70d62 100644
--- a/src/vdisk.c
+++ b/src/vdisk.c
@@ -28,13 +28,14 @@
  *
  */
 
+#include "cenv.h"
+
 #include <stdio.h>
 #include <stdlib.h>	/* For malloc */
 #include <stdarg.h>
 #include <string.h>
 
 #include "rcsid.h"
-#include "cenv.h"
 #include "word10.h"
 #include "osdsup.h"
 #include "vdisk.h"
diff --git a/src/vdkfmt.c b/src/vdkfmt.c
index 018527a..c9dc2f4 100644
--- a/src/vdkfmt.c
+++ b/src/vdkfmt.c
@@ -34,6 +34,8 @@
 **
 */
 
+#include "cenv.h"
+
 #include <string.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -44,7 +46,6 @@
 #include <sys/file.h>		/* For open() flags */
 
 #include "rcsid.h"
-#include "cenv.h"
 #include "osdsup.h"
 #include "vdisk.h"		/* Include virtual disk stuff */
 
diff --git a/src/vmtape.c b/src/vmtape.c
index 9f89975..293c9c3 100644
--- a/src/vmtape.c
+++ b/src/vmtape.c
@@ -105,6 +105,8 @@ hardware devices so as to finally provide a consistent interface.
 */
 
 
+#include "klh10.h"
+
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>	/* For malloc */
@@ -114,7 +116,6 @@ hardware devices so as to finally provide a consistent interface.
 #include <stdarg.h>	/* For error-reporting functions */
 #include <limits.h>
 
-#include "klh10.h"
 #include "osdsup.h"
 #include "word10.h"
 #include "wfio.h"	/* For word-based file i/o */
diff --git a/src/wfconv.c b/src/wfconv.c
index c0b0196..665e640 100644
--- a/src/wfconv.c
+++ b/src/wfconv.c
@@ -40,6 +40,8 @@
 
 */
 
+#include "cenv.h"	/* Just in case of LFS */
+
 #include <stdio.h>
 #include <stdlib.h>	/* Malloc and friends */
 #include <string.h>
diff --git a/src/wxtest.c b/src/wxtest.c
index 98c9738..352df82 100644
--- a/src/wxtest.c
+++ b/src/wxtest.c
@@ -44,6 +44,8 @@ guaranteed to be complete or reliable, and it's time-consuming to do
 this for all possible variations.
 */
 
+#include "cenv.h"	/* Just in case of LFS */
+
 #include <stdio.h>
 #include <limits.h>
 #include <stdlib.h>