diff -Nru 010/lib/source/country/bmsearch.c 011/lib/source/country/bmsearch.c
--- 010/lib/source/country/bmsearch.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/country/bmsearch.c	2014-03-19 02:24:34 +0000
@@ -16,8 +16,8 @@
   #include <ctype.h>
   #include <string.h>
 #else
+//#pragma inline
   #include <model.h>
-  #pragma inline
 #endif
 
 #include <country.h>
diff -Nru 010/lib/source/country/country.c 011/lib/source/country/country.c
--- 010/lib/source/country/country.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/country/country.c	2014-03-19 02:24:34 +0000
@@ -20,7 +20,7 @@
     #include <borland.h>
     #include <stdlib.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
   #include <model.h>
 #endif
diff -Nru 010/lib/source/country/memfcmp.c 011/lib/source/country/memfcmp.c
--- 010/lib/source/country/memfcmp.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/country/memfcmp.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
   #include <asmrules.h>
 #endif
diff -Nru 010/lib/source/country/stricmp.c 011/lib/source/country/stricmp.c
--- 010/lib/source/country/stricmp.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/country/stricmp.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
   #include <asmrules.h>
 #endif
diff -Nru 010/lib/source/country/strlwr.c 011/lib/source/country/strlwr.c
--- 010/lib/source/country/strlwr.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/country/strlwr.c	2014-03-19 02:24:34 +0000
@@ -15,7 +15,7 @@
 #ifdef _MSC_VER
 #include <borland.h>
 #else
-#pragma  inline
+//#pragma  inline
 #endif
 
 #include <string.h>
diff -Nru 010/lib/source/country/strnicmp.c 011/lib/source/country/strnicmp.c
--- 010/lib/source/country/strnicmp.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/country/strnicmp.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
   #include <asmrules.h>
 #endif
diff -Nru 010/lib/source/country/strupr.c 011/lib/source/country/strupr.c
--- 010/lib/source/country/strupr.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/country/strupr.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma  inline
+//  #pragma  inline
   #endif
   #include <asmrules.h>
 #endif
diff -Nru 010/lib/source/dos/chklock.c 011/lib/source/dos/chklock.c
--- 010/lib/source/dos/chklock.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/chklock.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
   #define INCL_DOSFILEMGR
   #include <os2.h>
 #else
-  #pragma inline
+//#pragma inline
 #endif
 
 #include <io.h>
diff -Nru 010/lib/source/dos/chkunlnk.c 011/lib/source/dos/chkunlnk.c
--- 010/lib/source/dos/chkunlnk.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/chkunlnk.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
 #define INCL_DOSFILEMGR
 #include <os2.h>
 #else
-#pragma inline
+//#pragma inline
 #include <model.h>
 #endif
 
diff -Nru 010/lib/source/dos/dosclose.c 011/lib/source/dos/dosclose.c
--- 010/lib/source/dos/dosclose.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/dosclose.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
 #define INCL_DOSFILEMGR
 #include <os2.h>
 #else
-#pragma inline
+//#pragma inline
 #include <model.h>
 #endif
 
diff -Nru 010/lib/source/dos/doscomit.c 011/lib/source/dos/doscomit.c
--- 010/lib/source/dos/doscomit.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/doscomit.c	2014-03-19 02:24:34 +0000
@@ -20,7 +20,7 @@
 #ifdef _MSC_VER
   #define _version _osversion
 #endif
-#pragma inline
+//#pragma inline
 #endif
 
 #include "dosfunc.h"
diff -Nru 010/lib/source/dos/doscreat.c 011/lib/source/dos/doscreat.c
--- 010/lib/source/dos/doscreat.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/doscreat.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
 #define INCL_DOSFILEMGR
 #include <os2.h>
 #else
-#pragma inline
+//#pragma inline
 #include <model.h>
 #endif
 
diff -Nru 010/lib/source/dos/dosdup.c 011/lib/source/dos/dosdup.c
--- 010/lib/source/dos/dosdup.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/dosdup.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
 #define INCL_DOSFILEMGR
 #include <os2.h>
 #else
-#pragma inline
+//#pragma inline
 #include <model.h>
 #endif
 
diff -Nru 010/lib/source/dos/dosfind.c 011/lib/source/dos/dosfind.c
--- 010/lib/source/dos/dosfind.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/dosfind.c	2014-03-19 02:24:34 +0000
@@ -21,9 +21,9 @@
     #include <borland.h>
     #include <direct.h>
   #else
+//  #pragma inline
     #include <dir.h>
     #include <model.h>
-    #pragma inline
   #endif
 #endif
 
diff -Nru 010/lib/source/dos/doslseek.c 011/lib/source/dos/doslseek.c
--- 010/lib/source/dos/doslseek.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/doslseek.c	2014-03-19 02:24:34 +0000
@@ -16,8 +16,8 @@
 #define INCL_DOSFILEMGR
 #include <os2.h>
 #else
+//#pragma inline
 #include <asmrules.h>
-#pragma inline
 #include <model.h>
 #endif
 
diff -Nru 010/lib/source/dos/dosopen.c 011/lib/source/dos/dosopen.c
--- 010/lib/source/dos/dosopen.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/dosopen.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
 #define INCL_DOSFILEMGR
 #include <os2.h>
 #else
-#pragma inline
+//#pragma inline
 #include <model.h>
 #endif
 
diff -Nru 010/lib/source/dos/dosread.c 011/lib/source/dos/dosread.c
--- 010/lib/source/dos/dosread.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/dosread.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
 #define INCL_DOSFILEMGR
 #include <os2.h>
 #else
-#pragma inline
+//#pragma inline
 #include <model.h>
 #endif
 
diff -Nru 010/lib/source/dos/doswrite.c 011/lib/source/dos/doswrite.c
--- 010/lib/source/dos/doswrite.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/doswrite.c	2014-03-19 02:24:34 +0000
@@ -16,7 +16,7 @@
 #define INCL_DOSFILEMGR
 #include <os2.h>
 #else
-#pragma inline
+//#pragma inline
 #include <model.h>
 #endif
 
diff -Nru 010/lib/source/dos/extended.c 011/lib/source/dos/extended.c
--- 010/lib/source/dos/extended.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/extended.c	2014-03-19 02:24:34 +0000
@@ -16,8 +16,8 @@
 #define INCL_DOSMISC
 #include <os2.h>
 #else
+//#pragma inline
 #include <model.h>
-#pragma inline
 #endif
 
 #include "dosfunc.h"
diff -Nru 010/lib/source/dos/strnchr.c 011/lib/source/dos/strnchr.c
--- 010/lib/source/dos/strnchr.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/dos/strnchr.c	2014-03-19 02:24:34 +0000
@@ -13,7 +13,7 @@
 
 
 #ifndef __OS2__
-  #pragma inline
+//#pragma inline
   #include <model.h>
 #endif
 
diff -Nru 010/lib/source/misc/bd_long.c 011/lib/source/misc/bd_long.c
--- 010/lib/source/misc/bd_long.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/misc/bd_long.c	2014-03-19 02:24:34 +0000
@@ -12,22 +12,21 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "misc.h"
-#ifdef DEBUG
-  #include <memcheck.h>
-#endif
 
 
 #ifndef __OS2__
-  #include <model.h>
-
+//#pragma inline
   #define EXPBYTE   7
   #define SIGNBYTE  6
   #define SIGBITS  55
-
-//#pragma inline
   #pragma warn -par
   #pragma warn -rvl
+  #include <model.h>
+#endif
+
+#include "misc.h"
+#ifdef DEBUG
+  #include <memcheck.h>
 #endif
 
 static ulong _NEAR_ LIBENTRY basdbletolongsub(basdble cArray) {
diff -Nru 010/lib/source/misc/bmsearch.c 011/lib/source/misc/bmsearch.c
--- 010/lib/source/misc/bmsearch.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/misc/bmsearch.c	2014-03-19 02:24:34 +0000
@@ -12,16 +12,16 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <misc.h>
-
 #ifdef __OS2__
   #include <ctype.h>
   #include <string.h>
 #else
-  #include <model.h>
 //#pragma inline
+  #include <model.h>
 #endif
 
+#include <misc.h>
+
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
diff -Nru 010/lib/source/misc/bs_long.c 011/lib/source/misc/bs_long.c
--- 010/lib/source/misc/bs_long.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/bs_long.c	2014-03-19 02:24:34 +0000
@@ -12,6 +12,11 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
+#if ! (defined(_MSC_VER) || defined(__OS2__))
+//#pragma inline
+  #include <model.h>
+#endif
+
 #include <stdio.h>
 #include "misc.h"
 #ifdef DEBUG
@@ -22,11 +27,6 @@
 #define SIGNBYTE 2
 #define SIGBITS  23
 
-#if ! (defined(_MSC_VER) || defined(__OS2__))
-  #pragma inline
-  #include <model.h>
-#endif
-
 #pragma warn -par
 #pragma warn -rvl
 
diff -Nru 010/lib/source/misc/cputype.c 011/lib/source/misc/cputype.c
--- 010/lib/source/misc/cputype.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/cputype.c	2014-03-19 02:24:34 +0000
@@ -12,7 +12,7 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#pragma inline
+//#pragma inline
 asm .286P
 
 /********************************************************************
diff -Nru 010/lib/source/misc/crypt.c 011/lib/source/misc/crypt.c
--- 010/lib/source/misc/crypt.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/crypt.c	2014-03-19 02:24:34 +0000
@@ -15,12 +15,12 @@
 #ifdef __OS2__
   #include <stdlib.h>
 #else
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma  inline
+//  #pragma  inline
   #endif
+  #include <model.h>
 #endif
 
 #include <misc.h>
diff -Nru 010/lib/source/misc/directry.c 011/lib/source/misc/directry.c
--- 010/lib/source/misc/directry.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/directry.c	2014-03-19 02:24:34 +0000
@@ -15,12 +15,12 @@
 /* this module has not been ported to OS/2 */
 
 #ifndef __OS2__
+//#pragma inline
 #include <model.h>
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
 
-#pragma inline
 
 typedef struct {
   char          Attrib;
diff -Nru 010/lib/source/misc/dmath.c 011/lib/source/misc/dmath.c
--- 010/lib/source/misc/dmath.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/dmath.c	2014-03-19 02:24:34 +0000
@@ -16,13 +16,13 @@
 
 #ifndef __OS2__
 
+//#pragma inline
 #include <model.h>
 #include "misc.h"
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
 
-#pragma inline
 
 void pascal dadd(dlong *Arg1, dlong *Arg2, dlong *Sum) {
 #ifdef LDATA
diff -Nru 010/lib/source/misc/driveok.c 011/lib/source/misc/driveok.c
--- 010/lib/source/misc/driveok.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/driveok.c	2014-03-19 02:24:34 +0000
@@ -11,6 +11,9 @@
 /* Copyright (C) 1996  Clark Development Company, Inc.  All Rights Reserved. */
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
+#ifndef __OS2__
+//#pragma inline
+#endif
 
 #include <dosfunc.h>
 #include <misc.h>
@@ -39,8 +42,6 @@
     #include <dos.h>
     #include <direct.h>
   #endif
-#else
-  #pragma inline
 #endif
 
 #include <misc.h>
diff -Nru 010/lib/source/misc/dtoc.c 011/lib/source/misc/dtoc.c
--- 010/lib/source/misc/dtoc.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/dtoc.c	2014-03-19 02:24:34 +0000
@@ -21,8 +21,8 @@
   #ifdef _MSC_VER
     #include <borland.h>
   #else
+//  #pragma  inline
     #include <model.h>
-    #pragma  inline
   #endif
 #endif
 
diff -Nru 010/lib/source/misc/evaluate.c 011/lib/source/misc/evaluate.c
--- 010/lib/source/misc/evaluate.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/evaluate.c	2014-03-19 02:24:34 +0000
@@ -16,14 +16,14 @@
 
 #ifndef __OS2__
 
+//#pragma inline
+
 #include <stdio.h>
 #include <string.h>
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
 
-#pragma inline
-
 long pascal evaluate(void far *p, unsigned Size) {
   if (Size == 0)
     return(0);
diff -Nru 010/lib/source/misc/exist.c 011/lib/source/misc/exist.c
--- 010/lib/source/misc/exist.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/exist.c	2014-03-19 02:24:34 +0000
@@ -21,9 +21,9 @@
     #include <borland.h>
     #include <direct.h>
   #else
+//  #pragma inline
     #include <dir.h>
     #include <model.h>
-    #pragma inline
   #endif
 #endif
 
diff -Nru 010/lib/source/misc/findfour.c 011/lib/source/misc/findfour.c
--- 010/lib/source/misc/findfour.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/findfour.c	2014-03-19 02:24:34 +0000
@@ -12,13 +12,15 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <stdio.h>
-#include <string.h>
-#include <misc.h>
 #ifndef __OS2__
+//#pragma inline
   #include <model.h>
-  #pragma inline
 #endif
+
+#include <stdio.h>
+#include <string.h>
+#include <misc.h>
+
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
diff -Nru 010/lib/source/misc/fmemcpy.c 011/lib/source/misc/fmemcpy.c
--- 010/lib/source/misc/fmemcpy.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/fmemcpy.c	2014-03-19 02:24:34 +0000
@@ -19,7 +19,7 @@
 #ifdef _MSC_VER
 #include <borland.h>
 #else
-#pragma inline
+//#pragma inline
 #endif
 
 #ifdef DEBUG
diff -Nru 010/lib/source/misc/fmemset.c 011/lib/source/misc/fmemset.c
--- 010/lib/source/misc/fmemset.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/fmemset.c	2014-03-19 02:24:34 +0000
@@ -16,14 +16,14 @@
 
 #ifndef __OS2__
 
-#ifdef DEBUG
-#include <memcheck.h>
-#endif
-
 #ifdef _MSC_VER
 #include <borland.h>
 #else
-#pragma inline
+//#pragma inline
+#endif
+
+#ifdef DEBUG
+#include <memcheck.h>
 #endif
 
 void pascal fmemset(void far *dest, char c, unsigned len) {
diff -Nru 010/lib/source/misc/isset.c 011/lib/source/misc/isset.c
--- 010/lib/source/misc/isset.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/misc/isset.c	2014-03-19 02:24:34 +0000
@@ -12,11 +12,6 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <misc.h>
-#ifdef DEBUG
-  #include <memcheck.h>
-#endif
-
 #ifndef __OS2__
   #ifdef _MSC_VER
     #include <borland.h>
@@ -25,6 +20,11 @@
   #endif
 #endif
 
+#include <misc.h>
+#ifdef DEBUG
+  #include <memcheck.h>
+#endif
+
 /*============================================================================
  Check to see if a specific bit is set
  ===========================================================================*/
diff -Nru 010/lib/source/misc/lastchar.c 011/lib/source/misc/lastchar.c
--- 010/lib/source/misc/lastchar.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/lastchar.c	2014-03-19 02:24:34 +0000
@@ -15,12 +15,12 @@
 #ifdef __OS2__
   #include <string.h>
 #else
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
+  #include <model.h>
 #endif
 
 #include <misc.h>
diff -Nru 010/lib/source/misc/long_bd.c 011/lib/source/misc/long_bd.c
--- 010/lib/source/misc/long_bd.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/long_bd.c	2014-03-19 02:24:34 +0000
@@ -12,6 +12,11 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
+#if ! (defined(_MSC_VER) || defined(__OS2__))
+//#pragma inline
+  #include <model.h>
+#endif
+
 #include <stdio.h>
 #include "misc.h"
 #ifdef DEBUG
@@ -22,11 +27,6 @@
 #define SIGNBYTE  6
 #define SIGBITS  55
 
-#if ! (defined(_MSC_VER) || defined(__OS2__))
-  #include <model.h>
-  #pragma inline
-#endif
-
 #pragma warn -par
 
 
diff -Nru 010/lib/source/misc/long_bs.c 011/lib/source/misc/long_bs.c
--- 010/lib/source/misc/long_bs.c	1996-08-09 09:48:26 +0000
+++ 011/lib/source/misc/long_bs.c	2014-03-19 02:24:34 +0000
@@ -12,6 +12,11 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
+#if ! (defined(_MSC_VER) || defined(__OS2__))
+//#pragma inline
+  #include <model.h>
+#endif
+
 #include <stdio.h>
 #include "misc.h"
 #ifdef DEBUG
@@ -22,11 +27,6 @@
 #define SIGNBYTE 2
 #define SIGBITS  23
 
-#if ! (defined(_MSC_VER) || defined(__OS2__))
-  #include <model.h>
-  #pragma inline
-#endif
-
 #pragma warn -par
 
 void LIBENTRY longtobassngl(bassngl cArray, long Num) {
diff -Nru 010/lib/source/misc/mstrcpy.c 011/lib/source/misc/mstrcpy.c
--- 010/lib/source/misc/mstrcpy.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/misc/mstrcpy.c	2014-03-19 02:24:34 +0000
@@ -12,8 +12,6 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "misc.h"
-
 #ifndef __OS2__
   #ifdef _MSC_VER
     #include <borland.h>
@@ -23,6 +21,8 @@
   #include <model.h>
 #endif
 
+#include "misc.h"
+
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
diff -Nru 010/lib/source/misc/padstr.c 011/lib/source/misc/padstr.c
--- 010/lib/source/misc/padstr.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/misc/padstr.c	2014-03-19 02:24:34 +0000
@@ -12,19 +12,19 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <misc.h>
-
 #ifdef __OS2__
   #include <string.h>
 #else
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
 //  #pragma inline
   #endif
+  #include <model.h>
 #endif
 
+#include <misc.h>
+
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
diff -Nru 010/lib/source/misc/prnready.c 011/lib/source/misc/prnready.c
--- 010/lib/source/misc/prnready.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/misc/prnready.c	2014-03-19 02:24:34 +0000
@@ -12,12 +12,6 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <misc.h>
-
-#ifdef DEBUG
-#include <memcheck.h>
-#endif
-
 #ifndef __OS2__
   #ifdef _MSC_VER
     #include <borland.h>
@@ -26,6 +20,12 @@
   #endif
 #endif
 
+#include <misc.h>
+
+#ifdef DEBUG
+#include <memcheck.h>
+#endif
+
 #pragma argsused
 bool LIBENTRY printerready(int LptNum) {
   #ifdef __OS2__
diff -Nru 010/lib/source/misc/rle.c 011/lib/source/misc/rle.c
--- 010/lib/source/misc/rle.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/misc/rle.c	2014-03-19 02:24:34 +0000
@@ -12,11 +12,11 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <misc.h>
 #ifndef __OS2__
-  #include <model.h>
 //#pragma inline
+  #include <model.h>
 #endif
+#include <misc.h>
 
 unsigned LIBENTRY doRLE(char *Dest, char *Srce, unsigned Len) {
 #ifdef __OS2__
diff -Nru 010/lib/source/misc/setbit.c 011/lib/source/misc/setbit.c
--- 010/lib/source/misc/setbit.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/misc/setbit.c	2014-03-19 02:24:34 +0000
@@ -12,11 +12,6 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <misc.h>
-#ifdef DEBUG
-#include <memcheck.h>
-#endif
-
 #ifndef __OS2__
   #ifdef _MSC_VER
     #include <borland.h>
@@ -25,6 +20,11 @@
   #endif
 #endif
 
+#include <misc.h>
+#ifdef DEBUG
+#include <memcheck.h>
+#endif
+
 /*============================================================================
  Set a specific bit
  ===========================================================================*/
diff -Nru 010/lib/source/misc/share.c 011/lib/source/misc/share.c
--- 010/lib/source/misc/share.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/misc/share.c	2014-03-19 02:24:34 +0000
@@ -12,6 +12,10 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
+#ifndef __OS2__
+//#pragma inline
+#endif
+
 #include <io.h>
 #include <stdio.h>
 #include <dosfunc.h>
@@ -20,10 +24,6 @@
   #include <memcheck.h>
 #endif
 
-#ifndef __OS2__
-  #pragma inline
-#endif
-
 /********************************************************************
 *
 *  Function: shareloaded()
diff -Nru 010/lib/source/misc/stripr.c 011/lib/source/misc/stripr.c
--- 010/lib/source/misc/stripr.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/misc/stripr.c	2014-03-19 02:24:34 +0000
@@ -12,18 +12,18 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <string.h>
-#include <misc.h>
-
 #ifndef __OS2__
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
+  #include <model.h>
 #endif
 
+#include <string.h>
+#include <misc.h>
+
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
diff -Nru 010/lib/source/misc/unsetbit.c 011/lib/source/misc/unsetbit.c
--- 010/lib/source/misc/unsetbit.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/misc/unsetbit.c	2014-03-19 02:24:34 +0000
@@ -12,11 +12,6 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <misc.h>
-#ifdef DEBUG
-#include <memcheck.h>
-#endif
-
 #ifndef __OS2__
   #ifdef _MSC_VER
     #include <borland.h>
@@ -25,6 +20,11 @@
   #endif
 #endif
 
+#include <misc.h>
+#ifdef DEBUG
+#include <memcheck.h>
+#endif
+
 /*============================================================================
  Make sure a specific bit is NOT set on
  ===========================================================================*/
diff -Nru 010/lib/source/misc/wildcard.c 011/lib/source/misc/wildcard.c
--- 010/lib/source/misc/wildcard.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/misc/wildcard.c	2014-03-19 02:24:34 +0000
@@ -12,14 +12,14 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
+//#pragma inline
+
 #include <string.h>
 #include <stdio.h>
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
 
-#pragma inline
-
 
 static void near pascal wildcard(char far *Field, int Len) {
   asm  Push Es
diff -Nru 010/lib/source/misc/zswapstr.c 011/lib/source/misc/zswapstr.c
--- 010/lib/source/misc/zswapstr.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/misc/zswapstr.c	2014-03-19 02:24:34 +0000
@@ -12,7 +12,7 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#pragma inline
+//#pragma inline
 
 #include <zsort.h>
 #include <model.h>
diff -Nru 010/lib/source/misc/zswapvir.c 011/lib/source/misc/zswapvir.c
--- 010/lib/source/misc/zswapvir.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/misc/zswapvir.c	2014-03-19 02:24:34 +0000
@@ -12,14 +12,14 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
+//#pragma inline
+
 #include <zsort.h>
 
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
 
-#pragma inline
-
 /*
     This routine specifically swaps the 5-byte record that VIRTUAL.C uses
     called VirType.
diff -Nru 010/lib/source/pcb/conffunc.c 011/lib/source/pcb/conffunc.c
--- 010/lib/source/pcb/conffunc.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/pcb/conffunc.c	2014-03-19 02:24:34 +0000
@@ -12,13 +12,13 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
+//#pragma inline
+
 #include <stdio.h>
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
 
-#pragma inline
-
 /*============================================================================
  SetupReg subroutine ... placed INLINE
 
diff -Nru 010/lib/source/screen/ansi.c 011/lib/source/screen/ansi.c
--- 010/lib/source/screen/ansi.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/ansi.c	2014-03-19 02:24:34 +0000
@@ -12,13 +12,13 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
+//#pragma inline
+
 #include <mem.h>
 #include <stdio.h>
 #include <model.h>
 #include "screen.h"
 
-#pragma inline
-
 char ansicolors[] = "04261537";
 
 void pascal ansi_print(char *str) {
diff -Nru 010/lib/source/screen/cls.c 011/lib/source/screen/cls.c
--- 010/lib/source/screen/cls.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/cls.c	2014-03-19 02:24:34 +0000
@@ -12,21 +12,20 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-#ifdef BIOS
-  #include "ansi.h"
-#endif
-
 #ifndef __OS2__
-  #include <model.h>
-
   #ifdef _MSC_VER
     #include <borland.h>
   #else
 //  #pragma inline
   #endif
+  #include <model.h>
 #endif /* ifndef __OS2__ */
 
+#include "screen.h"
+#ifdef BIOS
+  #include "ansi.h"
+#endif
+
 /********************************************************************
  *
  *  Function:  cls()
diff -Nru 010/lib/source/screen/clsbox.c 011/lib/source/screen/clsbox.c
--- 010/lib/source/screen/clsbox.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/clsbox.c	2014-03-19 02:24:34 +0000
@@ -12,18 +12,18 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-#ifdef BIOS
-  #include "ansi.h"
-#endif
-
 #ifndef __OS2__
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
 //  #pragma inline
   #endif
+  #include <model.h>
+#endif
+
+#include "screen.h"
+#ifdef BIOS
+  #include "ansi.h"
 #endif
 
 
diff -Nru 010/lib/source/screen/clscolor.c 011/lib/source/screen/clscolor.c
--- 010/lib/source/screen/clscolor.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/clscolor.c	2014-03-19 02:24:34 +0000
@@ -12,20 +12,20 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-
 #ifndef __OS2__
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
 //  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
+#include "screen.h"
+
 /********************************************************************
  *
  *  Function:  clscolor()
diff -Nru 010/lib/source/screen/cursor.c 011/lib/source/screen/cursor.c
--- 010/lib/source/screen/cursor.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/cursor.c	2014-03-19 02:24:34 +0000
@@ -12,8 +12,6 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <screen.h>
-
 #ifdef __OS2__
   #define INCL_VIO
   #include <os2.h>
@@ -25,6 +23,8 @@
   #endif
 #endif
 
+#include <screen.h>
+
 /********************************************************************
  *
  *  Function:  setcursor()
diff -Nru 010/lib/source/screen/datestr.c 011/lib/source/screen/datestr.c
--- 010/lib/source/screen/datestr.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/datestr.c	2014-03-19 02:24:34 +0000
@@ -15,12 +15,12 @@
 #ifdef __OS2__
   #include <stdio.h>
 #else
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
     #pragma inline
   #endif
+  #include <model.h>
 #endif
 
 #include <system.h>
diff -Nru 010/lib/source/screen/delete.c 011/lib/source/screen/delete.c
--- 010/lib/source/screen/delete.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/delete.c	2014-03-19 02:24:34 +0000
@@ -12,20 +12,20 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-
 #ifndef __OS2__
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
+#include "screen.h"
+
 /********************************************************************
  *
  *  Function:  deletechar()
diff -Nru 010/lib/source/screen/fastputc.c 011/lib/source/screen/fastputc.c
--- 010/lib/source/screen/fastputc.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/fastputc.c	2014-03-19 02:24:34 +0000
@@ -12,20 +12,20 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-
 #ifndef __OS2__
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
 //  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
+#include "screen.h"
+
 /********************************************************************
  *
  *  Function:  xyvalue()
diff -Nru 010/lib/source/screen/getmode.c 011/lib/source/screen/getmode.c
--- 010/lib/source/screen/getmode.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/getmode.c	2014-03-19 02:24:34 +0000
@@ -33,7 +33,7 @@
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
 #endif
 
diff -Nru 010/lib/source/screen/giveup.c 011/lib/source/screen/giveup.c
--- 010/lib/source/screen/giveup.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/giveup.c	2014-03-19 02:24:34 +0000
@@ -12,12 +12,12 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
+#ifdef __OS2__
 #include "screen.h"
 
 bool Novell = FALSE;
 bool DisableGiveup = FALSE;
 
-#ifdef __OS2__
 #define INCL_DOSPROCESS
 #include <os2.h>
 taskertype Tasker  = OS2;
@@ -27,15 +27,17 @@
 }
 
 #else  /* ifdef __OS2__ */
-#include <model.h>
-
 #ifdef _MSC_VER
 #include <borland.h>
 #include <stdlib.h>
 #else
+//#pragma inline
 #include <dos.h>
-#pragma inline
 #endif
+#include "screen.h"
+bool Novell = FALSE;
+bool DisableGiveup = FALSE;
+#include <model.h>
 
 taskertype Tasker = NMT;
 
diff -Nru 010/lib/source/screen/gotoxy.c 011/lib/source/screen/gotoxy.c
--- 010/lib/source/screen/gotoxy.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/gotoxy.c	2014-03-19 02:24:34 +0000
@@ -12,8 +12,6 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-
 #ifdef __OS2__
   #define INCL_VIO
   #include <os2.h>
@@ -28,6 +26,8 @@
   #endif
 #endif
 
+#include "screen.h"
+
 /********************************************************************
  *
  *  Function:  gotoxy()
diff -Nru 010/lib/source/screen/insert.c 011/lib/source/screen/insert.c
--- 010/lib/source/screen/insert.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/insert.c	2014-03-19 02:24:34 +0000
@@ -12,20 +12,20 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-
 #ifndef __OS2__
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
+#include "screen.h"
+
 /********************************************************************
  *
  *  Function:  insertchar()
diff -Nru 010/lib/source/screen/print.c 011/lib/source/screen/print.c
--- 010/lib/source/screen/print.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/print.c	2014-03-19 02:24:34 +0000
@@ -12,21 +12,21 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <string.h>
-#include "screen.h"
-
 #ifndef __OS2__
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
+#include <string.h>
+#include "screen.h"
+
 /********************************************************************
  *
  *  Function:  fastprint()
diff -Nru 010/lib/source/screen/printv.c 011/lib/source/screen/printv.c
--- 010/lib/source/screen/printv.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/printv.c	2014-03-19 02:24:34 +0000
@@ -12,21 +12,20 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-#include <string.h>
-
 #ifndef __OS2__
-  #include <model.h>
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
   #ifdef _MSC_VER
     #include <borland.h>
   #else
 //  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
+#include "screen.h"
+#include <string.h>
 
 /********************************************************************
  *
diff -Nru 010/lib/source/screen/readscr2.c 011/lib/source/screen/readscr2.c
--- 010/lib/source/screen/readscr2.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/readscr2.c	2014-03-19 02:24:34 +0000
@@ -12,20 +12,20 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-
 #ifndef __OS2__
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
 //  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
+#include "screen.h"
+
 /********************************************************************
  *
  *  Function:  readscreen2()
diff -Nru 010/lib/source/screen/readscrn.c 011/lib/source/screen/readscrn.c
--- 010/lib/source/screen/readscrn.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/readscrn.c	2014-03-19 02:24:34 +0000
@@ -12,20 +12,20 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-
 #ifndef __OS2__
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
+#include "screen.h"
+
 
 /********************************************************************
  *
diff -Nru 010/lib/source/screen/saverest.c 011/lib/source/screen/saverest.c
--- 010/lib/source/screen/saverest.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/saverest.c	2014-03-19 02:24:34 +0000
@@ -12,23 +12,23 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-
 #ifdef __OS2__
   #include <mem.h>
   #include <inline.h>
 #else
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
 //  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
+#include "screen.h"
+
 #ifdef DEBUG
 #include <memcheck.h>
 #endif
diff -Nru 010/lib/source/screen/scrolldn.c 011/lib/source/screen/scrolldn.c
--- 010/lib/source/screen/scrolldn.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/scrolldn.c	2014-03-19 02:24:34 +0000
@@ -12,24 +12,24 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <mem.h>
-#include <stdio.h>
-#include "screen.h"
-
 #ifdef __OS2__
   #include <inline.h>
 #else
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
+#include <mem.h>
+#include <stdio.h>
+#include "screen.h"
+
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
diff -Nru 010/lib/source/screen/scrollup.c 011/lib/source/screen/scrollup.c
--- 010/lib/source/screen/scrollup.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/scrollup.c	2014-03-19 02:24:34 +0000
@@ -12,24 +12,24 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <mem.h>
-#include <stdio.h>
-#include "screen.h"
-
 #ifdef __OS2__
   #include <inline.h>
 #else
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
+#include <mem.h>
+#include <stdio.h>
+#include "screen.h"
+
 #ifdef DEBUG
   #include <memcheck.h>
 #endif
diff -Nru 010/lib/source/screen/setatt.c 011/lib/source/screen/setatt.c
--- 010/lib/source/screen/setatt.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/setatt.c	2014-03-19 02:24:34 +0000
@@ -15,15 +15,15 @@
 #include "screen.h"
 
 #ifndef __OS2__
-  #ifdef BIOS
-    #include "ansi.h"
-  #endif
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
 //  #pragma inline
   #endif
+  #ifdef BIOS
+    #include "ansi.h"
+  #endif
+  #include <model.h>
 #endif
 
 /********************************************************************
diff -Nru 010/lib/source/screen/setrows.c 011/lib/source/screen/setrows.c
--- 010/lib/source/screen/setrows.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/setrows.c	2014-03-19 02:24:34 +0000
@@ -12,12 +12,12 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "screen.h"
-
 #ifndef __OS2__
 //#pragma inline
 #endif
 
+#include "screen.h"
+
 void LIBENTRY setrows(int NumRows) {
   if (Scrn_Adapter != VID_EGA && Scrn_Adapter != VID_VGA)
     return;
diff -Nru 010/lib/source/screen/time1.c 011/lib/source/screen/time1.c
--- 010/lib/source/screen/time1.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/time1.c	2014-03-19 02:24:34 +0000
@@ -15,12 +15,12 @@
 #ifdef __OS2__
   #include <stdio.h>
 #else
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
     #pragma inline
   #endif
+  #include <model.h>
 #endif
 
 #include <system.h>
diff -Nru 010/lib/source/screen/time2.c 011/lib/source/screen/time2.c
--- 010/lib/source/screen/time2.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/time2.c	2014-03-19 02:24:34 +0000
@@ -15,12 +15,12 @@
 #ifdef __OS2__
   #include <stdio.h>
 #else
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
     #pragma inline
   #endif
+  #include <model.h>
 #endif
 
 #include <system.h>
diff -Nru 010/lib/source/screen/timechng.c 011/lib/source/screen/timechng.c
--- 010/lib/source/screen/timechng.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/timechng.c	2014-03-19 02:24:34 +0000
@@ -13,7 +13,7 @@
 
 
 
-#pragma inline
+//#pragma inline
 
 /********************************************************************
  *
diff -Nru 010/lib/source/screen/twodig.c 011/lib/source/screen/twodig.c
--- 010/lib/source/screen/twodig.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/twodig.c	2014-03-19 02:24:34 +0000
@@ -12,9 +12,9 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <model.h>
+//#pragma inline
 
-#pragma inline
+#include <model.h>
 
 /********************************************************************
  *
diff -Nru 010/lib/source/screen/twodig0.c 011/lib/source/screen/twodig0.c
--- 010/lib/source/screen/twodig0.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/twodig0.c	2014-03-19 02:24:34 +0000
@@ -12,9 +12,9 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <model.h>
+//#pragma inline
 
-#pragma inline
+#include <model.h>
 
 /********************************************************************
  *
diff -Nru 010/lib/source/screen/wherex.c 011/lib/source/screen/wherex.c
--- 010/lib/source/screen/wherex.c	1996-08-09 09:48:28 +0000
+++ 011/lib/source/screen/wherex.c	2014-03-19 02:24:34 +0000
@@ -12,8 +12,6 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <screen.h>
-
 #ifdef __OS2__
   #define INCL_VIO
   #include <os2.h>
@@ -21,10 +19,12 @@
   #ifdef _MSC_VER
     #include <borland.h>
   #else
-    #pragma inline
+//  #pragma inline
   #endif
 #endif
 
+#include <screen.h>
+
 /********************************************************************
  *
  *  Function:  wherex()
diff -Nru 010/lib/source/screen/wherey.c 011/lib/source/screen/wherey.c
--- 010/lib/source/screen/wherey.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/screen/wherey.c	2014-03-19 02:24:34 +0000
@@ -12,8 +12,6 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include <screen.h>
-
 #ifdef __OS2__
   #define INCL_VIO
   #include <os2.h>
@@ -25,6 +23,8 @@
   #endif
 #endif
 
+#include <screen.h>
+
 /********************************************************************
  *
  *  Function:  wherey()
diff -Nru 010/lib/source/scrnio/bgetkey.c 011/lib/source/scrnio/bgetkey.c
--- 010/lib/source/scrnio/bgetkey.c	1996-08-09 09:48:30 +0000
+++ 011/lib/source/scrnio/bgetkey.c	2014-03-19 02:24:34 +0000
@@ -12,6 +12,10 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
+#ifndef __OS2__
+//#pragma inline
+#endif
+
 #include <scrnio.h>
 
 #ifdef __OS2__
@@ -60,8 +64,6 @@
 
 #else  /* ifdef __OS2__ */
 
-#pragma inline
-
 int LIBENTRY bgetkey(char Option) {
 asm   Cmp   byte ptr Option,1   /* are we merely TESTING the keyboard? */
 asm   Jne   GetKey              /*   no, go get the keystroke          */
diff -Nru 010/lib/source/system/bgetkey.c 011/lib/source/system/bgetkey.c
--- 010/lib/source/system/bgetkey.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/system/bgetkey.c	2014-03-19 02:24:34 +0000
@@ -12,6 +12,10 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
+#ifndef __OS2__
+//#pragma inline
+#endif
+
 #include "system.h"
 
 #ifdef TEST
@@ -133,8 +137,6 @@
 
 #include <dos.h>
 
-//#pragma inline
-
 uint far *KbdStatus = (uint far *) MK_FP(0x40,0x17);
 
 
diff -Nru 010/lib/source/system/sysdate.c 011/lib/source/system/sysdate.c
--- 010/lib/source/system/sysdate.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/system/sysdate.c	2014-03-19 02:24:34 +0000
@@ -12,24 +12,23 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "system.h"
-
-#ifdef DEBUG
-  #include <memcheck.h>
-#endif
-
 #ifdef __OS2__
   #define INCL_DOSDATETIME
   #include <os2.h>
 #else
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
 //  #pragma inline
   #endif
+  #include <model.h>
 #endif
 
+#include "system.h"
+
+#ifdef DEBUG
+  #include <memcheck.h>
+#endif
 
 void LIBENTRY getsysdate(sysdatetype *SysDate) {
   #ifdef __OS2__
diff -Nru 010/lib/source/system/systime.c 011/lib/source/system/systime.c
--- 010/lib/source/system/systime.c	2014-03-18 23:15:30 +0000
+++ 011/lib/source/system/systime.c	2014-03-19 02:24:34 +0000
@@ -12,24 +12,23 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 
-#include "system.h"
-
-#ifdef DEBUG
-  #include <memcheck.h>
-#endif
-
 #ifdef __OS2__
   #define INCL_DOSDATETIME
   #include <os2.h>
 #else
-  #include <model.h>
   #ifdef _MSC_VER
     #include <borland.h>
   #else
 //  #pragma inline
   #endif
+  #include <model.h>
 #endif
 
+#include "system.h"
+
+#ifdef DEBUG
+  #include <memcheck.h>
+#endif
 
 void LIBENTRY getsystime(systimetype *SysTime) {
   #ifdef __OS2__
