diff -Nru 011/lib/h/asmrules.h 012/lib/h/asmrules.h
--- 011/lib/h/asmrules.h	2014-10-01 16:27:48 +0000
+++ 012/lib/h/asmrules.h	2014-03-19 02:31:42 +0000
@@ -28,8 +28,8 @@
 /*|                                                              |*/
 /*[]------------------------------------------------------------[]*/
 
-#pragma inline
-#pragma warn -asm
+//#pragma inline
+//#pragma warn -asm
 
 /****
 #define  LPROG  (4 == sizeof (void (*) (void)))
diff -Nru 011/lib/h/cnameidx.h 012/lib/h/cnameidx.h
--- 011/lib/h/cnameidx.h	2014-10-01 16:27:48 +0000
+++ 012/lib/h/cnameidx.h	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 #define ___CNAMEIDX_H___
 
 #ifndef ___TYPES_HPP___
-  #include <types.hpp>
+  #include "types.hpp"
 #endif
 
 /******************************************************************************/
diff -Nru 011/lib/h/country.h 012/lib/h/country.h
--- 011/lib/h/country.h	2014-10-01 16:27:48 +0000
+++ 012/lib/h/country.h	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 #define H_COUNTRY
 
 #ifndef ___TYPES_HPP___
-  #include <types.hpp>
+  #include "types.hpp"
 #endif
 
 #ifndef _SIZE_T
diff -Nru 011/lib/h/dosclass.hpp 012/lib/h/dosclass.hpp
--- 011/lib/h/dosclass.hpp	2014-10-01 16:27:48 +0000
+++ 012/lib/h/dosclass.hpp	2014-03-19 02:31:42 +0000
@@ -44,15 +44,15 @@
 #include    <string.h>
 
 #if defined(LIB)
-#include    <pcbtools.h>
+#include    "pcbtools.h"
 #undef bool
 #undef TRUE
 #undef FALSE
 #else
-#include    <dosfunc.h>
+#include    "dosfunc.h"
 #endif
 
-#include    <types.hpp>
+#include    "types.hpp"
 
 #ifdef __WATCOMC__
   #include <io.h>
diff -Nru 011/lib/h/dosfunc.h 012/lib/h/dosfunc.h
--- 011/lib/h/dosfunc.h	2014-10-01 16:27:48 +0000
+++ 012/lib/h/dosfunc.h	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 #define H_DOSFUNC
 
 #ifndef ___TYPES_HPP___
-  #include <types.hpp>
+  #include "types.hpp"
 #endif
 
 #if defined(__BORLANDC__) || defined(__TURBOC__)
diff -Nru 011/lib/h/misc.h 012/lib/h/misc.h
--- 011/lib/h/misc.h	2014-10-01 16:27:48 +0000
+++ 012/lib/h/misc.h	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 #define H_MISC
 
 #ifndef ___TYPES_HPP___
-  #include <types.hpp>
+  #include "types.hpp"
 #endif
 
 #ifdef SECURE
diff -Nru 011/lib/h/newdata.h 012/lib/h/newdata.h
--- 011/lib/h/newdata.h	2014-10-01 16:27:48 +0000
+++ 012/lib/h/newdata.h	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 #define H_NEWDATA
 
 #ifndef ___TYPES_HPP___
-  #include <types.hpp>
+  #include "types.hpp"
 #endif
 
 enum {SEC_A=0,SEC_B,SEC_C,SEC_D,SEC_E,SEC_F,SEC_G,SEC_H,SEC_I,SEC_J,SEC_K,
diff -Nru 011/lib/h/pcb.h 012/lib/h/pcb.h
--- 011/lib/h/pcb.h	2014-10-01 16:27:48 +0000
+++ 012/lib/h/pcb.h	2014-03-19 02:31:42 +0000
@@ -16,11 +16,11 @@
 #define H_PCB
 
 #ifndef ___TYPES_HPP___
-  #include <types.hpp>
+  #include "types.hpp"
 #endif
 
 #ifndef H_NEWDATA
-  #include <newdata.h>
+  #include "newdata.h"
 #endif
 
 typedef enum {SAVEWITHOUTCHECK,SAVEWITHCHECK,ASKTOCHECK} exitsavetype;
diff -Nru 011/lib/h/pcbtools.h 012/lib/h/pcbtools.h
--- 011/lib/h/pcbtools.h	2014-10-01 16:27:48 +0000
+++ 012/lib/h/pcbtools.h	2014-03-19 02:31:42 +0000
@@ -17,7 +17,7 @@
 
 /* need to pull in TYPES.HPP */
 
-#include <types.hpp>
+#include "types.hpp"
 
 /* #define bool  char */
 /* #define TRUE  1    */
diff -Nru 011/lib/h/screen.h 012/lib/h/screen.h
--- 011/lib/h/screen.h	2014-10-01 16:27:48 +0000
+++ 012/lib/h/screen.h	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 #define H_SCREEN
 
 #ifndef ___TYPES_HPP___
-  #include <types.hpp>
+  #include "types.hpp"
 #endif
 
 typedef enum {VID_NONE,VID_MDA,VID_CGA,VID_EGA,VID_VGA,VID_MCGA} vidcardtype;
diff -Nru 011/lib/h/scrnio.ext 012/lib/h/scrnio.ext
--- 011/lib/h/scrnio.ext	2014-10-01 16:27:48 +0000
+++ 012/lib/h/scrnio.ext	2014-03-19 02:31:42 +0000
@@ -50,7 +50,7 @@
 extern struct MenuType Menu[];    /* used to hold an array of menus */
 extern void (LIBENTRY *MenuFunc[])(void);
 
-extern char   _FARDATA_ MenuList[][36];
+extern char   MenuList[][36];
 extern char   MenuAvail[];
 
 extern char   Colors[];           /* holds current ACTIVE screen colors  */
diff -Nru 011/lib/h/scrnio.h 012/lib/h/scrnio.h
--- 011/lib/h/scrnio.h	2014-10-01 16:27:48 +0000
+++ 012/lib/h/scrnio.h	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 #define H_SCRNIO
 
 #ifndef ___TYPES_HPP___
-  #include <types.hpp>
+  #include "types.hpp"
 #endif
 
 #define HELPLINES           11     /* used for the help display */
diff -Nru 011/lib/h/session.hpp 012/lib/h/session.hpp
--- 011/lib/h/session.hpp	2014-10-01 16:27:48 +0000
+++ 012/lib/h/session.hpp	2014-03-19 02:32:12 +0000
@@ -16,7 +16,7 @@
 #define HPP_SESSION
 
 #ifndef ___TYPES_HPP___
-  #include <types.hpp>
+  #include "types.hpp"
 #endif
 
 enum {START_WINDOWED=0,START_MINIMIZED,START_FULLSCREEN,START_DEFAULT};
diff -Nru 011/lib/h/system.h 012/lib/h/system.h
--- 011/lib/h/system.h	2014-10-01 16:27:48 +0000
+++ 012/lib/h/system.h	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 #define H_SYSTEM
 
 #ifndef ___TYPES_HPP___
-  #include <types.hpp>
+  #include "types.hpp"
 #endif
 
 #ifdef SECURE
diff -Nru 011/lib/source/country/country.c 012/lib/source/country/country.c
--- 011/lib/source/country/country.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/country/country.c	2014-03-19 02:31:42 +0000
@@ -22,15 +22,15 @@
   #else
 //  #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include <dos.h>
 #include <stdlib.h>
 #include <string.h>
-#include <misc.h>
-#include <country.h>
-#include <tables.h>   /* this header has DEFAULT tables already built so */
+#include "misc.h"
+#include "country.h"
+#include "tables.h"   /* this header has DEFAULT tables already built so */
                       /* that strupr(), etc, will work WITHOUT having to */
                       /* first call getcountryspecs()                    */
 
diff -Nru 011/lib/source/country/date.c 012/lib/source/country/date.c
--- 011/lib/source/country/date.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/country/date.c	2014-03-19 02:31:42 +0000
@@ -12,7 +12,7 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <country.h>
+#include "country.h"
 
 #define swapchar(a,b) { Tmp = a; a = b; b = Tmp; }
 
diff -Nru 011/lib/source/country/dcomma.c 012/lib/source/country/dcomma.c
--- 011/lib/source/country/dcomma.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/country/dcomma.c	2014-03-19 02:31:42 +0000
@@ -15,8 +15,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <misc.h>
-#include <country.h>
+#include "misc.h"
+#include "country.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/dos/chkunlnk.c 012/lib/source/dos/chkunlnk.c
--- 011/lib/source/dos/chkunlnk.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/chkunlnk.c	2014-03-19 02:31:42 +0000
@@ -17,7 +17,7 @@
 #include <os2.h>
 #else
 //#pragma inline
-#include <model.h>
+#include "model.h"
 #endif
 
 #include "dosfunc.h"
diff -Nru 011/lib/source/dos/dosappen.c 012/lib/source/dos/dosappen.c
--- 011/lib/source/dos/dosappen.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/dosappen.c	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #include "dosfunc.h"
 #ifdef DEBUG
 #include <memcheck.h>
diff -Nru 011/lib/source/dos/dosclose.c 012/lib/source/dos/dosclose.c
--- 011/lib/source/dos/dosclose.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/dosclose.c	2014-03-19 02:31:42 +0000
@@ -17,7 +17,7 @@
 #include <os2.h>
 #else
 //#pragma inline
-#include <model.h>
+#include "model.h"
 #endif
 
 #include "dosfunc.h"
diff -Nru 011/lib/source/dos/doscreat.c 012/lib/source/dos/doscreat.c
--- 011/lib/source/dos/doscreat.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/doscreat.c	2014-03-19 02:31:42 +0000
@@ -17,7 +17,7 @@
 #include <os2.h>
 #else
 //#pragma inline
-#include <model.h>
+#include "model.h"
 #endif
 
 #include <string.h>
diff -Nru 011/lib/source/dos/dosdup.c 012/lib/source/dos/dosdup.c
--- 011/lib/source/dos/dosdup.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/dosdup.c	2014-03-19 02:31:42 +0000
@@ -17,7 +17,7 @@
 #include <os2.h>
 #else
 //#pragma inline
-#include <model.h>
+#include "model.h"
 #endif
 
 #include <string.h>
diff -Nru 011/lib/source/dos/dosfind.c 012/lib/source/dos/dosfind.c
--- 011/lib/source/dos/dosfind.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/dosfind.c	2014-03-19 02:31:42 +0000
@@ -23,13 +23,13 @@
   #else
 //  #pragma inline
     #include <dir.h>
-    #include <model.h>
+    #include "model.h"
   #endif
 #endif
 
 #include <malloc.h>
 #include <dos.h>
-#include <dosfunc.h>
+#include "dosfunc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/dos/dosfopen.c 012/lib/source/dos/dosfopen.c
--- 011/lib/source/dos/dosfopen.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/dosfopen.c	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <malloc.h>
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #include "dosfunc.h"
 #ifdef DEBUG
 #include <memcheck.h>
diff -Nru 011/lib/source/dos/doslseek.c 012/lib/source/dos/doslseek.c
--- 011/lib/source/dos/doslseek.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/doslseek.c	2014-03-19 02:31:42 +0000
@@ -18,7 +18,7 @@
 #else
 //#pragma inline
 #include <asmrules.h>
-#include <model.h>
+#include "model.h"
 #endif
 
 #include "dosfunc.h"
diff -Nru 011/lib/source/dos/dosopen.c 012/lib/source/dos/dosopen.c
--- 011/lib/source/dos/dosopen.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/dosopen.c	2014-03-19 02:31:42 +0000
@@ -17,7 +17,7 @@
 #include <os2.h>
 #else
 //#pragma inline
-#include <model.h>
+#include "model.h"
 #endif
 
 
diff -Nru 011/lib/source/dos/dosread.c 012/lib/source/dos/dosread.c
--- 011/lib/source/dos/dosread.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/dosread.c	2014-03-19 02:31:42 +0000
@@ -17,7 +17,7 @@
 #include <os2.h>
 #else
 //#pragma inline
-#include <model.h>
+#include "model.h"
 #endif
 
 #include "dosfunc.h"
diff -Nru 011/lib/source/dos/doswrite.c 012/lib/source/dos/doswrite.c
--- 011/lib/source/dos/doswrite.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/doswrite.c	2014-03-19 02:31:42 +0000
@@ -17,7 +17,7 @@
 #include <os2.h>
 #else
 //#pragma inline
-#include <model.h>
+#include "model.h"
 #endif
 
 #include <io.h>
diff -Nru 011/lib/source/dos/extended.c 012/lib/source/dos/extended.c
--- 011/lib/source/dos/extended.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/extended.c	2014-03-19 02:31:42 +0000
@@ -17,7 +17,7 @@
 #include <os2.h>
 #else
 //#pragma inline
-#include <model.h>
+#include "model.h"
 #endif
 
 #include "dosfunc.h"
diff -Nru 011/lib/source/dos/getdrive.c 012/lib/source/dos/getdrive.c
--- 011/lib/source/dos/getdrive.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/getdrive.c	2014-03-19 02:31:42 +0000
@@ -18,8 +18,8 @@
   #include <dos.h>
 #endif
 
-#include <types.hpp>
-#include <dosfunc.h>
+#include "types.hpp"
+#include "dosfunc.h"
 
 /* returns 1 for A, 2 for B, 3 for C and so on */
 
diff -Nru 011/lib/source/dos/getpath.c 012/lib/source/dos/getpath.c
--- 011/lib/source/dos/getpath.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/getpath.c	2014-03-19 02:31:42 +0000
@@ -18,7 +18,7 @@
   #include <direct.h>
 #endif
 
-#include <dosfunc.h>
+#include "dosfunc.h"
 
 void LIBENTRY dosgetcurpath(unsigned Drive, char *Path, int PathSize) {
   unsigned SaveDrive = dosgetcurdrive();
diff -Nru 011/lib/source/dos/setdrive.c 012/lib/source/dos/setdrive.c
--- 011/lib/source/dos/setdrive.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/setdrive.c	2014-03-19 02:31:42 +0000
@@ -19,7 +19,7 @@
   #include <dos.h>
 #endif
 
-#include <dosfunc.h>
+#include "dosfunc.h"
 
 /* uses 1 for A, 2 for B, 3 for C and so on */
 /* returns the last drive in the system */
diff -Nru 011/lib/source/dos/strnchr.c 012/lib/source/dos/strnchr.c
--- 011/lib/source/dos/strnchr.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/dos/strnchr.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 #ifndef __OS2__
 //#pragma inline
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include "dosfunc.h"
@@ -30,7 +30,7 @@
 #endif
 #endif
 
-
+#pragma warn -rvl
 char * LIBENTRY strnchr(char *StrPtr, char C, int Len) {
   #ifdef __OS2__
 
diff -Nru 011/lib/source/doscls/dosclass.cpp 012/lib/source/doscls/dosclass.cpp
--- 011/lib/source/doscls/dosclass.cpp	2014-10-01 16:27:48 +0000
+++ 012/lib/source/doscls/dosclass.cpp	2014-10-01 16:46:50 +0000
@@ -17,9 +17,9 @@
 #include    <io.h>
 #include    <stdarg.h>
 
-#include    <clearbuf.hpp>
+#include    "clearbuf.hpp"
 
-#include    <dosclass.hpp>
+#include    "dosclass.hpp"
 
 #ifdef DEBUG
 #include    <memcheck.h>
@@ -62,6 +62,7 @@
 {
     close();
     // build temp name here
+    if (!*path) return path; // dummy to suppress warning for now
     return _name;
 }
 
diff -Nru 011/lib/source/misc/abort.c 012/lib/source/misc/abort.c
--- 011/lib/source/misc/abort.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/abort.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 #include <stdio.h>
 #include <process.h>
-#include <screen.h>
+#include "screen.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/append.c 012/lib/source/misc/append.c
--- 011/lib/source/misc/append.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/append.c	2014-03-19 02:31:42 +0000
@@ -21,7 +21,7 @@
 #include <io.h>
 #include <stdio.h>
 #include <string.h>
-#include <dosfunc.h>
+#include "dosfunc.h"
 #include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
diff -Nru 011/lib/source/misc/ascii.c 012/lib/source/misc/ascii.c
--- 011/lib/source/misc/ascii.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/ascii.c	2014-03-19 02:31:42 +0000
@@ -18,7 +18,7 @@
   #else
     #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include <misc.h>
diff -Nru 011/lib/source/misc/bd_long.c 012/lib/source/misc/bd_long.c
--- 011/lib/source/misc/bd_long.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/bd_long.c	2014-03-19 02:31:42 +0000
@@ -21,7 +21,7 @@
   #define SIGBITS  55
   #pragma warn -par
   #pragma warn -rvl
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include "misc.h"
diff -Nru 011/lib/source/misc/binary.c 012/lib/source/misc/binary.c
--- 011/lib/source/misc/binary.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/binary.c	2014-03-19 02:31:42 +0000
@@ -13,7 +13,7 @@
 
 
 #include <stdio.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/bmsearch.c 012/lib/source/misc/bmsearch.c
--- 011/lib/source/misc/bmsearch.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/bmsearch.c	2014-03-19 02:31:42 +0000
@@ -17,10 +17,10 @@
   #include <string.h>
 #else
 //#pragma inline
-  #include <model.h>
+  #include "model.h"
 #endif
 
-#include <misc.h>
+#include "misc.h"
 
 #ifdef DEBUG
   #include <memcheck.h>
diff -Nru 011/lib/source/misc/bs_long.c 012/lib/source/misc/bs_long.c
--- 011/lib/source/misc/bs_long.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/bs_long.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 #if ! (defined(_MSC_VER) || defined(__OS2__))
 //#pragma inline
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include <stdio.h>
diff -Nru 011/lib/source/misc/buildstr.c 012/lib/source/misc/buildstr.c
--- 011/lib/source/misc/buildstr.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/buildstr.c	2014-03-19 02:31:42 +0000
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/change.c 012/lib/source/misc/change.c
--- 011/lib/source/misc/change.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/change.c	2014-03-19 02:31:42 +0000
@@ -12,7 +12,7 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <misc.h>
+#include "misc.h"
 
 void LIBENTRY change(char *Str, char Old, char New) {
   for (; *Str != 0; Str++) {
diff -Nru 011/lib/source/misc/chkmove.c 012/lib/source/misc/chkmove.c
--- 011/lib/source/misc/chkmove.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/chkmove.c	2014-03-19 02:31:42 +0000
@@ -21,10 +21,10 @@
 #include <mem.h>
 #include <stdio.h>
 #include <string.h>
-#include <screen.h>
-#include <scrnio.h>
-#include <scrnio.ext>
-#include <validate.h>
+#include "screen.h"
+#include "scrnio.h"
+#include "scrnio.ext"
+#include "validate.h"
 #include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
diff -Nru 011/lib/source/misc/comma.c 012/lib/source/misc/comma.c
--- 011/lib/source/misc/comma.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/comma.c	2014-03-19 02:31:42 +0000
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/copyfile.c 012/lib/source/misc/copyfile.c
--- 011/lib/source/misc/copyfile.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/copyfile.c	2014-03-19 02:31:42 +0000
@@ -19,7 +19,7 @@
 /* #include <screen.h> */
 /* #include <scrnio.h> */
 /* #include <scrnio.ext> */
-#include <dosfunc.h>
+#include "dosfunc.h"
 #include "misc.h"
 
 #if defined(_MSC_VER) || defined(__WATCOMC__)
diff -Nru 011/lib/source/misc/crypt.c 012/lib/source/misc/crypt.c
--- 011/lib/source/misc/crypt.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/crypt.c	2014-03-19 02:31:42 +0000
@@ -20,10 +20,10 @@
   #else
 //  #pragma  inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/ctod.c 012/lib/source/misc/ctod.c
--- 011/lib/source/misc/ctod.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/ctod.c	2014-03-19 02:31:42 +0000
@@ -13,7 +13,7 @@
 
 
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/dayoweek.c 012/lib/source/misc/dayoweek.c
--- 011/lib/source/misc/dayoweek.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/dayoweek.c	2014-03-19 02:31:42 +0000
@@ -12,8 +12,8 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <system.h>
-#include <misc.h>
+#include "system.h"
+#include "misc.h"
 
 #ifdef DEBUG
   #include <memcheck.h>
diff -Nru 011/lib/source/misc/dcomma.c 012/lib/source/misc/dcomma.c
--- 011/lib/source/misc/dcomma.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/dcomma.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/delfiles.c 012/lib/source/misc/delfiles.c
--- 011/lib/source/misc/delfiles.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/delfiles.c	2014-03-19 02:31:42 +0000
@@ -22,8 +22,8 @@
 #include <dos.h>
 #include <stdio.h>
 #include <string.h>
-#include <dosfunc.h>
-#include <misc.h>
+#include "dosfunc.h"
+#include "misc.h"
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/directry.c 012/lib/source/misc/directry.c
--- 011/lib/source/misc/directry.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/directry.c	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 
 #ifndef __OS2__
 //#pragma inline
-#include <model.h>
+#include "model.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/diskfree.c 012/lib/source/misc/diskfree.c
--- 011/lib/source/misc/diskfree.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/diskfree.c	2014-03-19 02:31:42 +0000
@@ -26,8 +26,8 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <dosfunc.h>
-#include <misc.h>
+#include "dosfunc.h"
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/driveok.c 012/lib/source/misc/driveok.c
--- 011/lib/source/misc/driveok.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/driveok.c	2014-03-19 02:31:42 +0000
@@ -15,8 +15,8 @@
 //#pragma inline
 #endif
 
-#include <dosfunc.h>
-#include <misc.h>
+#include "dosfunc.h"
+#include "misc.h"
 
 bool LIBENTRY driveok(char Drive) {
   unsigned CurDisk;
diff -Nru 011/lib/source/misc/dtoc.c 012/lib/source/misc/dtoc.c
--- 011/lib/source/misc/dtoc.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/dtoc.c	2014-03-19 02:31:42 +0000
@@ -13,7 +13,7 @@
 
 
 #include <string.h>
-#include <screen.h>
+#include "screen.h"
 
 #ifdef __OS2__
   #include <stdio.h>
@@ -22,7 +22,7 @@
     #include <borland.h>
   #else
 //  #pragma  inline
-    #include <model.h>
+    #include "model.h"
   #endif
 #endif
 
diff -Nru 011/lib/source/misc/editor.c 012/lib/source/misc/editor.c
--- 011/lib/source/misc/editor.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/editor.c	2014-03-19 02:31:42 +0000
@@ -18,9 +18,9 @@
 
 #include <mem.h>
 #include <alloc.h>
-#include <screen.h>
-#include <scrnio.h>
-#include <scrnio.ext>
+#include "screen.h"
+#include "scrnio.h"
+#include "scrnio.ext"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/endstr.c 012/lib/source/misc/endstr.c
--- 011/lib/source/misc/endstr.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/endstr.c	2014-03-19 02:31:42 +0000
@@ -13,7 +13,7 @@
 
 
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/exist.c 012/lib/source/misc/exist.c
--- 011/lib/source/misc/exist.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/exist.c	2014-03-19 02:31:42 +0000
@@ -23,17 +23,17 @@
   #else
 //  #pragma inline
     #include <dir.h>
-    #include <model.h>
+    #include "model.h"
   #endif
 #endif
 
 #include <dos.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
 
-
+#pragma warn -rvl
 /********************************************************************
 *
 *  Function: fileexist()
diff -Nru 011/lib/source/misc/findfour.c 012/lib/source/misc/findfour.c
--- 011/lib/source/misc/findfour.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/findfour.c	2014-03-19 02:31:42 +0000
@@ -14,12 +14,12 @@
 
 #ifndef __OS2__
 //#pragma inline
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include <stdio.h>
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 
 #ifdef DEBUG
   #include <memcheck.h>
diff -Nru 011/lib/source/misc/findname.c 012/lib/source/misc/findname.c
--- 011/lib/source/misc/findname.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/findname.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/fullname.c 012/lib/source/misc/fullname.c
--- 011/lib/source/misc/fullname.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/fullname.c	2014-03-19 02:31:42 +0000
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <types.hpp>
+#include "types.hpp"
 void LIBENTRY fullyqualifiedname(char *Q, char *File, int QLen) {
   _fullpath(Q,File,QLen);
   strupr(Q);
diff -Nru 011/lib/source/misc/hextoi.c 012/lib/source/misc/hextoi.c
--- 011/lib/source/misc/hextoi.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/hextoi.c	2014-03-19 02:31:42 +0000
@@ -12,7 +12,7 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/index.c 012/lib/source/misc/index.c
--- 011/lib/source/misc/index.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/index.c	2014-03-19 02:31:42 +0000
@@ -12,7 +12,7 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/isset.c 012/lib/source/misc/isset.c
--- 011/lib/source/misc/isset.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/isset.c	2014-03-19 02:31:42 +0000
@@ -20,7 +20,7 @@
   #endif
 #endif
 
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
@@ -28,7 +28,7 @@
 /*============================================================================
  Check to see if a specific bit is set
  ===========================================================================*/
-
+#pragma warn -rvl
 int LIBENTRY isset(void _FAR_ *BitStream, int BitNum) {
 #ifdef __OS2__
   char *p = (char *) BitStream + (BitNum >> 3);  // add BitNum/8 to the pointer
diff -Nru 011/lib/source/misc/julian.c 012/lib/source/misc/julian.c
--- 011/lib/source/misc/julian.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/julian.c	2014-03-19 02:31:42 +0000
@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <system.h>
+#include "system.h"
 #include "misc.h"
 #ifdef DEBUG
   #include <memcheck.h>
diff -Nru 011/lib/source/misc/lastchar.c 012/lib/source/misc/lastchar.c
--- 011/lib/source/misc/lastchar.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/lastchar.c	2014-03-19 02:31:42 +0000
@@ -20,15 +20,15 @@
   #else
 //  #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
 
-
+#pragma warn -rvl
 /********************************************************************
 *
 *  Function:  lastcharinstr()
diff -Nru 011/lib/source/misc/leftstr.c 012/lib/source/misc/leftstr.c
--- 011/lib/source/misc/leftstr.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/leftstr.c	2014-03-19 02:31:42 +0000
@@ -13,7 +13,7 @@
 
 
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/long_bd.c 012/lib/source/misc/long_bd.c
--- 011/lib/source/misc/long_bd.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/long_bd.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 #if ! (defined(_MSC_VER) || defined(__OS2__))
 //#pragma inline
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include <stdio.h>
diff -Nru 011/lib/source/misc/long_bs.c 012/lib/source/misc/long_bs.c
--- 011/lib/source/misc/long_bs.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/long_bs.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 #if ! (defined(_MSC_VER) || defined(__OS2__))
 //#pragma inline
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include <stdio.h>
diff -Nru 011/lib/source/misc/midstr.c 012/lib/source/misc/midstr.c
--- 011/lib/source/misc/midstr.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/midstr.c	2014-03-19 02:31:42 +0000
@@ -13,7 +13,7 @@
 
 
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/mkunique.c 012/lib/source/misc/mkunique.c
--- 011/lib/source/misc/mkunique.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/mkunique.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/movefile.c 012/lib/source/misc/movefile.c
--- 011/lib/source/misc/movefile.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/movefile.c	2014-03-19 02:31:42 +0000
@@ -25,9 +25,9 @@
 #include <mem.h>
 #include <stdio.h>
 #include <string.h>
-#include <screen.h>
-#include <scrnio.h>
-#include <scrnio.ext>
+#include "screen.h"
+#include "scrnio.h"
+#include "scrnio.ext"
 #include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
diff -Nru 011/lib/source/misc/mstrcpy.c 012/lib/source/misc/mstrcpy.c
--- 011/lib/source/misc/mstrcpy.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/mstrcpy.c	2014-03-19 02:31:42 +0000
@@ -18,7 +18,7 @@
   #else
 //  #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include "misc.h"
diff -Nru 011/lib/source/misc/padstr.c 012/lib/source/misc/padstr.c
--- 011/lib/source/misc/padstr.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/padstr.c	2014-03-19 02:31:42 +0000
@@ -20,10 +20,10 @@
   #else
 //  #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
-#include <misc.h>
+#include "misc.h"
 
 #ifdef DEBUG
   #include <memcheck.h>
diff -Nru 011/lib/source/misc/prnready.c 012/lib/source/misc/prnready.c
--- 011/lib/source/misc/prnready.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/prnready.c	2014-03-19 02:31:42 +0000
@@ -20,12 +20,13 @@
   #endif
 #endif
 
-#include <misc.h>
+#include "misc.h"
 
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
 
+#pragma warn -rvl
 #pragma argsused
 bool LIBENTRY printerready(int LptNum) {
   #ifdef __OS2__
diff -Nru 011/lib/source/misc/proper.c 012/lib/source/misc/proper.c
--- 011/lib/source/misc/proper.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/proper.c	2014-03-19 02:31:42 +0000
@@ -15,7 +15,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/psearch.c 012/lib/source/misc/psearch.c
--- 011/lib/source/misc/psearch.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/psearch.c	2014-03-19 02:31:42 +0000
@@ -142,7 +142,7 @@
     }
     p++;
   }
-  return(TOK_END);  /* keep the compiler happy */
+//return(TOK_END);  /* keep the compiler happy */
 }
 
 
diff -Nru 011/lib/source/misc/rightstr.c 012/lib/source/misc/rightstr.c
--- 011/lib/source/misc/rightstr.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/rightstr.c	2014-03-19 02:31:42 +0000
@@ -13,7 +13,7 @@
 
 
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/rle.c 012/lib/source/misc/rle.c
--- 011/lib/source/misc/rle.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/rle.c	2014-03-19 02:31:42 +0000
@@ -14,9 +14,9 @@
 
 #ifndef __OS2__
 //#pragma inline
-  #include <model.h>
+  #include "model.h"
 #endif
-#include <misc.h>
+#include "misc.h"
 
 unsigned LIBENTRY doRLE(char *Dest, char *Srce, unsigned Len) {
 #ifdef __OS2__
diff -Nru 011/lib/source/misc/setbit.c 012/lib/source/misc/setbit.c
--- 011/lib/source/misc/setbit.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/setbit.c	2014-03-19 02:31:42 +0000
@@ -20,7 +20,7 @@
   #endif
 #endif
 
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/share.c 012/lib/source/misc/share.c
--- 011/lib/source/misc/share.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/share.c	2014-03-19 02:31:42 +0000
@@ -18,12 +18,13 @@
 
 #include <io.h>
 #include <stdio.h>
-#include <dosfunc.h>
+#include "dosfunc.h"
 #include "misc.h"
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
 
+#pragma warn -rvl
 /********************************************************************
 *
 *  Function: shareloaded()
diff -Nru 011/lib/source/misc/soundex.c 012/lib/source/misc/soundex.c
--- 011/lib/source/misc/soundex.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/soundex.c	2014-03-19 02:31:42 +0000
@@ -14,10 +14,10 @@
 
 #ifndef __OS2__
   #pragma inline
-  #include <model.h>
+  #include "model.h"
 #endif
 
-#include <misc.h>
+#include "misc.h"
 
 #ifdef DEBUG
   #include <memcheck.h>
diff -Nru 011/lib/source/misc/stripl.c 012/lib/source/misc/stripl.c
--- 011/lib/source/misc/stripl.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/stripl.c	2014-03-19 02:31:42 +0000
@@ -13,7 +13,7 @@
 
 
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/stripr.c 012/lib/source/misc/stripr.c
--- 011/lib/source/misc/stripr.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/stripr.c	2014-03-19 02:31:42 +0000
@@ -18,11 +18,11 @@
   #else
 //  #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 
 #ifdef DEBUG
   #include <memcheck.h>
diff -Nru 011/lib/source/misc/subst.c 012/lib/source/misc/subst.c
--- 011/lib/source/misc/subst.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/subst.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/swapenv.c 012/lib/source/misc/swapenv.c
--- 011/lib/source/misc/swapenv.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/swapenv.c	2014-03-19 02:31:42 +0000
@@ -16,8 +16,8 @@
 #include <alloc.h>
 #include <stdlib.h>
 #include <string.h>
-#include <_process.h>
-#include <swap.h>
+#include "_process.h"
+#include "swap.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/timesten.c 012/lib/source/misc/timesten.c
--- 011/lib/source/misc/timesten.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/timesten.c	2014-03-19 02:31:42 +0000
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/ttoc.c 012/lib/source/misc/ttoc.c
--- 011/lib/source/misc/ttoc.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/ttoc.c	2014-03-19 02:31:42 +0000
@@ -17,7 +17,7 @@
   #include <stdio.h>
 #else
 //#pragma inline
-  #include <model.h>
+  #include "model.h"
 #endif
 #ifdef DEBUG
   #include <memcheck.h>
diff -Nru 011/lib/source/misc/unsetbit.c 012/lib/source/misc/unsetbit.c
--- 011/lib/source/misc/unsetbit.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/unsetbit.c	2014-03-19 02:31:42 +0000
@@ -20,7 +20,7 @@
   #endif
 #endif
 
-#include <misc.h>
+#include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/validate.c 012/lib/source/misc/validate.c
--- 011/lib/source/misc/validate.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/validate.c	2014-03-19 02:31:42 +0000
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <dosfunc.h>
+#include "dosfunc.h"
 #include "validate.h"
 #include "misc.h"
 #ifdef DEBUG
diff -Nru 011/lib/source/misc/zswapint.c 012/lib/source/misc/zswapint.c
--- 011/lib/source/misc/zswapint.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/zswapint.c	2014-03-19 02:31:42 +0000
@@ -12,7 +12,7 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <zsort.h>
+#include "zsort.h"
 
 #ifdef DEBUG
 #include <memcheck.h>
diff -Nru 011/lib/source/misc/zswaplng.c 012/lib/source/misc/zswaplng.c
--- 011/lib/source/misc/zswaplng.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/zswaplng.c	2014-03-19 02:31:42 +0000
@@ -12,7 +12,7 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <zsort.h>
+#include "zsort.h"
 
 #ifdef DEBUG
 #include <memcheck.h>
diff -Nru 011/lib/source/misc/zswapstr.c 012/lib/source/misc/zswapstr.c
--- 011/lib/source/misc/zswapstr.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/zswapstr.c	2014-03-19 02:31:42 +0000
@@ -14,8 +14,8 @@
 
 //#pragma inline
 
-#include <zsort.h>
-#include <model.h>
+#include "zsort.h"
+#include "model.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/misc/zswapvir.c 012/lib/source/misc/zswapvir.c
--- 011/lib/source/misc/zswapvir.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/misc/zswapvir.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 //#pragma inline
 
-#include <zsort.h>
+#include "zsort.h"
 
 #ifdef DEBUG
 #include <memcheck.h>
diff -Nru 011/lib/source/pcb/abort.c 012/lib/source/pcb/abort.c
--- 011/lib/source/pcb/abort.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/abort.c	2014-03-19 02:31:42 +0000
@@ -13,10 +13,10 @@
 
 
 #include <mem.h>
-#include <scrnio.h>
-#include <scrnio.ext>
-#include <system.h>
-#include <pcb.h>
+#include "scrnio.h"
+#include "scrnio.ext"
+#include "system.h"
+#include "pcb.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/pcb/account.c 012/lib/source/pcb/account.c
--- 011/lib/source/pcb/account.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/account.c	2014-03-19 02:31:42 +0000
@@ -13,10 +13,10 @@
 
 
 #include <mem.h>
-#include <dosfunc.h>
-#include <pcb.h>
-#include <misc.h>
-#include <account.h>
+#include "dosfunc.h"
+#include "pcb.h"
+#include "misc.h"
+#include "account.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/pcb/addbacks.c 012/lib/source/pcb/addbacks.c
--- 011/lib/source/pcb/addbacks.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/addbacks.c	2014-03-19 02:31:42 +0000
@@ -13,7 +13,7 @@
 
 
 #include <string.h>
-#include <pcb.h>
+#include "pcb.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/pcb/allow.c 012/lib/source/pcb/allow.c
--- 011/lib/source/pcb/allow.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/allow.c	2014-03-19 02:31:42 +0000
@@ -14,9 +14,9 @@
 
 #include <dos.h>
 #include <stdio.h>
-#include <screen.h>
-#include <scrnio.h>
-#include <scrnio.ext>
+#include "screen.h"
+#include "scrnio.h"
+#include "scrnio.ext"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/pcb/ci_other.c 012/lib/source/pcb/ci_other.c
--- 011/lib/source/pcb/ci_other.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/ci_other.c	2014-03-19 02:31:42 +0000
@@ -31,10 +31,10 @@
 
 #include    <stdio.h>
 #include    <string.h>
-#include    <dosfunc.h>
-#include    <misc.h>
-#include    <newdata.h>
-#include    <cnameidx.h>
+#include    "dosfunc.h"
+#include    "misc.h"
+#include    "newdata.h"
+#include    "cnameidx.h"
 
 #ifdef DEBUG
 #include    <memcheck.h>
diff -Nru 011/lib/source/pcb/cnames.c 012/lib/source/pcb/cnames.c
--- 011/lib/source/pcb/cnames.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/cnames.c	2014-03-19 02:31:42 +0000
@@ -19,14 +19,14 @@
 #endif
 
 #ifndef __OS2__
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <misc.h>
-#include <dosfunc.h>
+#include "misc.h"
+#include "dosfunc.h"
 #include "pcb.h"
 #ifdef DEBUG
 #include <memcheck.h>
diff -Nru 011/lib/source/pcb/config.c 012/lib/source/pcb/config.c
--- 011/lib/source/pcb/config.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/config.c	2014-03-19 02:31:42 +0000
@@ -15,8 +15,8 @@
 #include <io.h>
 #include <stdio.h>
 #include <string.h>
-#include <misc.h>
-#include <dosfunc.h>
+#include "misc.h"
+#include "dosfunc.h"
 #include "newdata.h"
 #include "pcb.h"
 #ifdef DEBUG
diff -Nru 011/lib/source/pcb/data120.c 012/lib/source/pcb/data120.c
--- 011/lib/source/pcb/data120.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/data120.c	2014-03-19 02:31:42 +0000
@@ -16,12 +16,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <screen.h>
-#include <scrnio.h>
-#include <scrnio.ext>
-#include <misc.h>
-#include <dosfunc.h>
-#include <validate.h>
+#include "screen.h"
+#include "scrnio.h"
+#include "scrnio.ext"
+#include "misc.h"
+#include "dosfunc.h"
+#include "validate.h"
 #include "pcb.h"
 #ifdef DEBUG
 #include <memcheck.h>
diff -Nru 011/lib/source/pcb/datafil2.c 012/lib/source/pcb/datafil2.c
--- 011/lib/source/pcb/datafil2.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/datafil2.c	2014-03-19 02:31:42 +0000
@@ -23,11 +23,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <screen.h>
-#include <scrnio.h>
-#include <scrnio.ext>
-#include <misc.h>
-#include <dosfunc.h>
+#include "screen.h"
+#include "scrnio.h"
+#include "scrnio.ext"
+#include "misc.h"
+#include "dosfunc.h"
 #include "newdata.h"
 #include "pcb.h"
 #ifdef DEBUG
diff -Nru 011/lib/source/pcb/dataread.c 012/lib/source/pcb/dataread.c
--- 011/lib/source/pcb/dataread.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/dataread.c	2014-03-19 02:31:42 +0000
@@ -26,12 +26,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <process.h>
-#include <screen.h>
-#include <scrnio.h>
-#include <scrnio.ext>
-#include <dosfunc.h>
-#include <system.h>
-#include <misc.h>
+#include "screen.h"
+#include "scrnio.h"
+#include "scrnio.ext"
+#include "dosfunc.h"
+#include "system.h"
+#include "misc.h"
 #include "newdata.h"
 #include "pcb.h"
 #ifdef DEBUG
diff -Nru 011/lib/source/pcb/exitdos.c 012/lib/source/pcb/exitdos.c
--- 011/lib/source/pcb/exitdos.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/exitdos.c	2014-03-19 02:31:42 +0000
@@ -14,9 +14,9 @@
 
 #include <string.h>
 #include <process.h>
-#include <screen.h>
-#include <dosfunc.h>
-#include <pcb.h>
+#include "screen.h"
+#include "dosfunc.h"
+#include "pcb.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/pcb/parse.c 012/lib/source/pcb/parse.c
--- 011/lib/source/pcb/parse.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/parse.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <pcb.h>
+#include "pcb.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/pcb/parsepth.c 012/lib/source/pcb/parsepth.c
--- 011/lib/source/pcb/parsepth.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/parsepth.c	2014-03-19 02:31:42 +0000
@@ -14,7 +14,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <pcb.h>
+#include "pcb.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/pcb/savetext.c 012/lib/source/pcb/savetext.c
--- 011/lib/source/pcb/savetext.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/savetext.c	2014-03-19 02:31:42 +0000
@@ -12,10 +12,10 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <screen.h>
-#include <scrnio.h>
-#include <scrnio.ext>
-#include <pcb.h>
+#include "screen.h"
+#include "scrnio.h"
+#include "scrnio.ext"
+#include "pcb.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/pcb/srchpath.c 012/lib/source/pcb/srchpath.c
--- 011/lib/source/pcb/srchpath.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/pcb/srchpath.c	2014-03-19 02:31:42 +0000
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <dosfunc.h>
-#include <misc.h>
+#include "dosfunc.h"
+#include "misc.h"
 #include "newdata.h"
 #include "pcb.h"
 #ifdef DEBUG
diff -Nru 011/lib/source/screen/cls.c 012/lib/source/screen/cls.c
--- 011/lib/source/screen/cls.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/cls.c	2014-03-19 02:31:42 +0000
@@ -18,7 +18,7 @@
   #else
 //  #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif /* ifndef __OS2__ */
 
 #include "screen.h"
diff -Nru 011/lib/source/screen/clsbox.c 012/lib/source/screen/clsbox.c
--- 011/lib/source/screen/clsbox.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/clsbox.c	2014-03-19 02:31:42 +0000
@@ -18,7 +18,7 @@
   #else
 //  #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include "screen.h"
diff -Nru 011/lib/source/screen/clscolor.c 012/lib/source/screen/clscolor.c
--- 011/lib/source/screen/clscolor.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/clscolor.c	2014-03-19 02:31:42 +0000
@@ -21,7 +21,7 @@
   #ifdef BIOS
     #include "ansi.h"
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include "screen.h"
diff -Nru 011/lib/source/screen/cursor.c 012/lib/source/screen/cursor.c
--- 011/lib/source/screen/cursor.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/cursor.c	2014-03-19 02:31:42 +0000
@@ -23,7 +23,7 @@
   #endif
 #endif
 
-#include <screen.h>
+#include "screen.h"
 
 /********************************************************************
  *
diff -Nru 011/lib/source/screen/datestr.c 012/lib/source/screen/datestr.c
--- 011/lib/source/screen/datestr.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/datestr.c	2014-03-19 02:31:42 +0000
@@ -20,11 +20,11 @@
   #else
     #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
-#include <system.h>
-#include <screen.h>
+#include "system.h"
+#include "screen.h"
 
 
 /********************************************************************
diff -Nru 011/lib/source/screen/fastputc.c 012/lib/source/screen/fastputc.c
--- 011/lib/source/screen/fastputc.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/fastputc.c	2014-03-19 02:31:42 +0000
@@ -21,7 +21,7 @@
   #ifdef BIOS
     #include "ansi.h"
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include "screen.h"
diff -Nru 011/lib/source/screen/giveup.c 012/lib/source/screen/giveup.c
--- 011/lib/source/screen/giveup.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/giveup.c	2014-03-19 02:31:42 +0000
@@ -37,7 +37,7 @@
 #include "screen.h"
 bool Novell = FALSE;
 bool DisableGiveup = FALSE;
-#include <model.h>
+#include "model.h"
 
 taskertype Tasker = NMT;
 
diff -Nru 011/lib/source/screen/print.c 012/lib/source/screen/print.c
--- 011/lib/source/screen/print.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/print.c	2014-03-19 02:31:44 +0000
@@ -21,7 +21,7 @@
   #ifdef BIOS
     #include "ansi.h"
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include <string.h>
diff -Nru 011/lib/source/screen/printv.c 012/lib/source/screen/printv.c
--- 011/lib/source/screen/printv.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/printv.c	2014-03-19 02:31:44 +0000
@@ -21,7 +21,7 @@
   #ifdef BIOS
     #include "ansi.h"
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include "screen.h"
diff -Nru 011/lib/source/screen/readscr2.c 012/lib/source/screen/readscr2.c
--- 011/lib/source/screen/readscr2.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/readscr2.c	2014-03-19 02:31:44 +0000
@@ -21,7 +21,7 @@
   #ifdef BIOS
     #include "ansi.h"
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include "screen.h"
diff -Nru 011/lib/source/screen/saverest.c 012/lib/source/screen/saverest.c
--- 011/lib/source/screen/saverest.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/saverest.c	2014-03-19 02:31:44 +0000
@@ -24,7 +24,7 @@
   #ifdef BIOS
     #include "ansi.h"
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include "screen.h"
diff -Nru 011/lib/source/screen/setatt.c 012/lib/source/screen/setatt.c
--- 011/lib/source/screen/setatt.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/setatt.c	2014-03-19 02:31:44 +0000
@@ -23,7 +23,7 @@
   #ifdef BIOS
     #include "ansi.h"
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 /********************************************************************
diff -Nru 011/lib/source/screen/time1.c 012/lib/source/screen/time1.c
--- 011/lib/source/screen/time1.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/time1.c	2014-03-19 02:31:44 +0000
@@ -20,7 +20,7 @@
   #else
     #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include <system.h>
diff -Nru 011/lib/source/screen/time2.c 012/lib/source/screen/time2.c
--- 011/lib/source/screen/time2.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/time2.c	2014-03-19 02:31:44 +0000
@@ -20,7 +20,7 @@
   #else
     #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include <system.h>
diff -Nru 011/lib/source/screen/wherey.c 012/lib/source/screen/wherey.c
--- 011/lib/source/screen/wherey.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/screen/wherey.c	2014-03-19 02:31:44 +0000
@@ -23,8 +23,9 @@
   #endif
 #endif
 
-#include <screen.h>
+#include "screen.h"
 
+#pragma warn -rvl
 /********************************************************************
  *
  *  Function:  wherey()
diff -Nru 011/lib/source/system/sysdate.c 012/lib/source/system/sysdate.c
--- 011/lib/source/system/sysdate.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/system/sysdate.c	2014-03-19 02:31:44 +0000
@@ -21,7 +21,7 @@
   #else
 //  #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include "system.h"
diff -Nru 011/lib/source/system/systime.c 012/lib/source/system/systime.c
--- 011/lib/source/system/systime.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/system/systime.c	2014-03-19 02:31:44 +0000
@@ -21,7 +21,7 @@
   #else
 //  #pragma inline
   #endif
-  #include <model.h>
+  #include "model.h"
 #endif
 
 #include "system.h"
diff -Nru 011/lib/source/toolkit/altmodem.c 012/lib/source/toolkit/altmodem.c
--- 011/lib/source/toolkit/altmodem.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/toolkit/altmodem.c	2014-03-19 02:31:44 +0000
@@ -19,7 +19,7 @@
   #include <mem.h>
 #endif
 #include <string.h>
-#include <pcbtools.h>
+#include "pcbtools.h"
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
diff -Nru 011/lib/source/toolkit/nodisp.c 012/lib/source/toolkit/nodisp.c
--- 011/lib/source/toolkit/nodisp.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/toolkit/nodisp.c	2014-03-19 02:31:44 +0000
@@ -12,7 +12,7 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <pcbtools.h>
+#include "pcbtools.h"
 
 void LIBENTRY checkdisplaystatus(void) {
 }
diff -Nru 011/lib/source/toolkit/pcbdat.c 012/lib/source/toolkit/pcbdat.c
--- 011/lib/source/toolkit/pcbdat.c	2014-10-01 16:27:48 +0000
+++ 012/lib/source/toolkit/pcbdat.c	2014-03-19 02:31:44 +0000
@@ -14,8 +14,8 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <dosfunc.h>
-#include <misc.h>
+#include "dosfunc.h"
+#include "misc.h"
 #include "newdata.h"
 #ifdef DEBUG
 #include <memcheck.h>
