diff --git a/inc/locfile.h b/inc/locfile.h
index 296c42d..a6d3c0b 100755
--- a/inc/locfile.h
+++ b/inc/locfile.h
@@ -703,6 +703,9 @@ extern	int	errno;
 #define DIRSEPSTR "/"
 #define DIRSEP '/'
 #define UNIXDIRSEP '/'
+/* system includes may already define MAXNAMLEN */
+#if !defined(MAXNAMLEN)
 #define MAXNAMLEN NAME_MAX
 #endif
+#endif
 
diff --git a/inc/version.h b/inc/version.h
index dfd0efc..6df1806 100755
--- a/inc/version.h
+++ b/inc/version.h
@@ -349,15 +349,11 @@ typedef signed char s_char;
 	/*							*/
 	/********************************************************/
 #ifdef OS5
-		/* Solaris, sort of SYSV-ish */
+		/* Solaris, sort of SYSV-ish, but not really */
 #undef HAS_GETHOSTID
-#define SYSVONLY 1
+#define BSD_COMP 1
 #define SYSVSIGNALS 1
-#define index           strchr
-#define rindex          strrchr
-#define bzero(b,n)      memset(b,0,n)
-#define bcmp(a,b,n)     memcmp(a,b,n)
-#define bcopy(a,b,n)    memcpy(b,a,n)
+#define WAITINT 1
 #define L_SET SEEK_SET
 #define NOFORN
 #define LOCK_X_UPDATES 1