diff --git a/hdr/ddate.h b/hdr/ddate.h
index 12a8e61..7a96ba5 100644
--- a/hdr/ddate.h
+++ b/hdr/ddate.h
@@ -1,6 +1,6 @@
 /****************************************************************/
 /*                                                              */
-/*                           date.h                             */
+/*                          ddate.h                             */
 /*                                                              */
 /*                  DOS General Date Structure                  */
 /*                                                              */
diff --git a/hdr/dtime.h b/hdr/dtime.h
index ea1549e..cf58074 100644
--- a/hdr/dtime.h
+++ b/hdr/dtime.h
@@ -1,6 +1,6 @@
 /****************************************************************/
 /*                                                              */
-/*                           time.h                             */
+/*                          dtime.h                             */
 /*                                                              */
 /*                  DOS General Time Structure                  */
 /*                                                              */
diff --git a/hdr/nls.h b/hdr/nls.h
index 845461d..ec358c5 100644
--- a/hdr/nls.h
+++ b/hdr/nls.h
@@ -28,7 +28,7 @@
 /****************************************************************/
 
 /* one byte alignment */
-#include <algnbyte.h>
+#include "algnbyte.h"
 
 /*
  *	Description of the organization of NLS information -- 2000/02/13 ska
@@ -175,7 +175,7 @@
  *
  *	Performance tweaks:
  *	When the system -- This word applies to the combination of kernel and
- *	any loaded MUX-14 extension á la NLSFUNC here. -- uppercases
+ *	any loaded MUX-14 extension � la NLSFUNC here. -- uppercases
  *	_filenames_, it must perform a DOS-65-A2 internally. In the basic
  *	implementation this request would be channeled through MUX-14, even
  *	if there is no external NLSFUNC at all. Also, when a NLS pkg had
@@ -623,7 +623,7 @@ struct nlsCSys_loadPackage {
 };
 
 /* standard alignment */
-#include <algndflt.h>
+#include "algndflt.h"
 
 #ifdef DEBUG
         /* Enable debugging of NLS part */
diff --git a/hdr/pcb.h b/hdr/pcb.h
index 2b8394b..79b3ea2 100644
--- a/hdr/pcb.h
+++ b/hdr/pcb.h
@@ -57,7 +57,7 @@ static BYTE *pcb_hRcsId =
 #endif
 
    /* Force one-byte alignment for all the internal structures, see above */
-#include <algnbyte.h>
+#include "algnbyte.h"
 /*                                                                      */
 /* interrupt handler structure definition                               */
 /*                                                                      */
@@ -158,7 +158,7 @@ typedef struct {
 #define FLG_CARRY       0x0001
 
    /* Allow default alignment from now on */
-#include <algndflt.h>
+#include "algndflt.h"
 
 #endif
 
diff --git a/kernel/nls.c b/kernel/nls.c
index 7d6d164..7cc9786 100644
--- a/kernel/nls.c
+++ b/kernel/nls.c
@@ -36,7 +36,7 @@
 #include "portab.h"
 #include "globals.h"
 #include "pcb.h"
-#include <nls.h>
+#include "nls.h"
 
 #ifdef VERSION_STRINGS
 static BYTE *RcsId =