diff -c -r open_watcom_1.5.0/bld/cc/c/cinfo.c open_watcom_1.5.0.orig/bld/cc/c/cinfo.c
*** open_watcom_1.5.0/bld/cc/c/cinfo.c	2006-05-04 08:47:53.000000000 +0900
--- open_watcom_1.5.0.orig/bld/cc/c/cinfo.c	2006-05-02 03:43:51.000000000 +0900
***************
*** 210,217 ****
  }
  
  
! // fe_attr FEAttr( CGSYM_HANDLE cgsym_handle )	// XXX
! int FEAttr( CGSYM_HANDLE cgsym_handle )
  /*****************************************/
  {
      SYM_HANDLE sym_handle = cgsym_handle;
--- 210,216 ----
  }
  
  
! fe_attr FEAttr( CGSYM_HANDLE cgsym_handle )
  /*****************************************/
  {
      SYM_HANDLE sym_handle = cgsym_handle;
diff -c -r open_watcom_1.5.0/bld/clib/environ/c/gtcmdunx.c open_watcom_1.5.0.orig/bld/clib/environ/c/gtcmdunx.c
*** open_watcom_1.5.0/bld/clib/environ/c/gtcmdunx.c	2006-05-04 07:43:54.000000000 +0900
--- open_watcom_1.5.0.orig/bld/clib/environ/c/gtcmdunx.c	2006-05-02 03:43:54.000000000 +0900
***************
*** 33,39 ****
  #include <stdio.h>
  #include <limits.h>
  #include <string.h>
! // #include <process.h>		// XXX
  
  extern  char    **_argv;                /* argument vector */
  
--- 33,39 ----
  #include <stdio.h>
  #include <limits.h>
  #include <string.h>
! #include <process.h>
  
  extern  char    **_argv;                /* argument vector */
  
diff -c -r open_watcom_1.5.0/bld/ndisasm/core/c/disbuild.c open_watcom_1.5.0.orig/bld/ndisasm/core/c/disbuild.c
*** open_watcom_1.5.0/bld/ndisasm/core/c/disbuild.c	2006-05-04 08:12:52.000000000 +0900
--- open_watcom_1.5.0.orig/bld/ndisasm/core/c/disbuild.c	2006-05-02 03:44:10.000000000 +0900
***************
*** 241,247 ****
  
  #endif
  
- #define	DISCPU_x64	0	// XXX
  #if DISCPU & DISCPU_x64
  
  ins_decode_data X64DecodeTable1[] = {
--- 241,246 ----
diff -c -r open_watcom_1.5.0/bld/sdk/rc/wres/c/loadres.c open_watcom_1.5.0.orig/bld/sdk/rc/wres/c/loadres.c
*** open_watcom_1.5.0/bld/sdk/rc/wres/c/loadres.c	2006-05-04 08:00:21.000000000 +0900
--- open_watcom_1.5.0.orig/bld/sdk/rc/wres/c/loadres.c	2006-05-02 03:44:26.000000000 +0900
***************
*** 39,45 ****
      #ifdef _AIX
          #define alloca __alloca
      #endif
-     #define _WCI86FAR
  #endif
  
  #ifdef WIN_GUI
--- 39,44 ----
diff -c -r open_watcom_1.5.0/bld/sdk/rc/wres/c/loadstr.c open_watcom_1.5.0.orig/bld/sdk/rc/wres/c/loadstr.c
*** open_watcom_1.5.0/bld/sdk/rc/wres/c/loadstr.c	2006-05-04 07:59:30.000000000 +0900
--- open_watcom_1.5.0.orig/bld/sdk/rc/wres/c/loadstr.c	2006-05-02 03:44:26.000000000 +0900
***************
*** 39,45 ****
      #ifdef _AIX
          #define alloca __alloca
      #endif
-     #define _WCI86FAR
  #endif
  
  #ifdef WIN_GUI
--- 39,44 ----
diff -c -r open_watcom_1.5.0/bld/watcom/h/xfloat.h open_watcom_1.5.0.orig/bld/watcom/h/xfloat.h
*** open_watcom_1.5.0/bld/watcom/h/xfloat.h	2006-05-04 08:40:29.000000000 +0900
--- open_watcom_1.5.0.orig/bld/watcom/h/xfloat.h	2006-05-02 03:44:52.000000000 +0900
***************
*** 104,111 ****
        int       nz2;            // OUTPUT: followed by this many '0's
  } CVT_INFO;
  
- 
- #define	_WMRTLINK	// XXX
  _WMRTLINK extern void __LDcvt(
                           long_double *pld,      // pointer to long_double
                           CVT_INFO  *cvt,        // conversion info
--- 104,109 ----