diff --git a/hdr/device.h b/hdr/device.h
index 0d28abd..53167d7 100644
--- a/hdr/device.h
+++ b/hdr/device.h
@@ -112,9 +112,6 @@ static BYTE *device_hRcsId =
 #ifndef FALSE
 #define FALSE           0
 #endif
-#define mk_offset(far_ptr)      ((UWORD)(far_ptr))
-#define mk_segment(far_ptr) ((UWORD)((ULONG)(far_ptr) >> 16))
-#define far_ptr(seg, off) ((VOID FAR *)(((ULONG)(off))+((ULONG)(seg) << 16)))
 
 /*
  *      structures
diff --git a/hdr/portab.h b/hdr/portab.h
index 6600a89..eecd53a 100644
--- a/hdr/portab.h
+++ b/hdr/portab.h
@@ -194,7 +194,7 @@ typedef unsigned short CLUSTER;
 #endif
 typedef unsigned short UNICODE;
 
-#ifdef STATICS
+#if defined(STATICS) || defined(__WATCOMC__)
 #define STATIC static		 /* local calls inside module */
 #else
 #define STATIC