--- os2sdk/demos/apps/ds/ds.h	2018/08/09 12:25:13	1.1.1.1
+++ os2sdk/demos/apps/ds/ds.h	2018/08/09 12:26:01	1.1.1.2
@@ -1,10 +1,10 @@
 /*  ds.h  - definitions for DS */
 
-#include    <doscalls.h>
-#include    <subcalls.h>
+#define     INCL_SUB
+#define     INCL_DOSFILEMGR
 
-#define     FALSE   0
-#define     TRUE    1
+#include    <os2def.h>
+#include    <bse.h>
 
 #define     VioHandle	0
 
@@ -65,7 +65,7 @@
 #define     INIT_FILE_HEADER	"DS Initialization File - Ben Slivka\n"
 
 
-typedef struct FileFindBuf FileSearch;
+typedef FILEFINDBUF FileSearch;
 
 
 #define     SB_LENGTH	43
@@ -83,8 +83,8 @@ typedef struct DirStruct {
 } Directory;
 
 typedef struct {
-    unsigned char    theChar;
-    unsigned char    theAttr;
+    UCHAR	     theChar;
+    UCHAR	     theAttr;
 } cellType;
 
 typedef struct {
@@ -98,20 +98,20 @@ typedef struct {
 /*  Stuff from VIO.H */
 
 typedef struct {
-    unsigned char   ch; 	/* character */
-    unsigned char   at; 	/* attribute */
+    UCHAR	    ch; 	/* character */
+    UCHAR	    at; 	/* attribute */
 } Cell;
 
-typedef unsigned char Attr;
+typedef UCHAR	      Attr;
 /*
 #define     cefs(a) (Cell far *)(a)
 */
-#define     cefs(a) (char far *)(a) /* Bogus for subcalls.h */
+#define     cefs(a) (PBYTE)(a) /* Bogus for subcalls.h */
 
-#define     afs(a) (Attr far *)(a)
-#define     chfs(a) (char far *)(a)
-#define     ifs(a) (int far *)(a)
-#define     ufs(a) (unsigned int far *)(a)
+#define     afs(a) (PBYTE)(a)
+#define     chfs(a) (PCHAR)(a)
+#define     ifs(a) (PINT)(a)
+#define     ufs(a) (PUSHORT)(a)
 
 /***	Attribute definitions	*/