diff --git a/autogen.sh b/autogen.sh
index 4cb1a4f..ab6e453 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,9 +21,9 @@ EOF
 
 rm -f autogen.log
 
-echo $ECHO_N "aclocal...    $ECHO_C" && aclocal -I m4 -I autoconf >>./autogen.log 2>&1 && echo "OK.  (25% done)" &&
+echo $ECHO_N "aclocal...    $ECHO_C" && aclocal-1.10 -I m4 -I autoconf >>./autogen.log 2>&1 && echo "OK.  (25% done)" &&
 echo $ECHO_N "autoheader... $ECHO_C" && autoheader                >>./autogen.log 2>&1 && echo "OK.  (50% done)" &&
-echo $ECHO_N "automake...   $ECHO_C" && automake                  >>./autogen.log 2>&1 && echo "OK.  (75% done)" &&
+echo $ECHO_N "automake...   $ECHO_C" && automake-1.10             >>./autogen.log 2>&1 && echo "OK.  (75% done)" &&
 echo $ECHO_N "autoconf...   $ECHO_C" && autoconf                  >>./autogen.log 2>&1 && echo "OK.  (100% done)"
 
 R=$?
diff --git a/cmpsc.h b/cmpsc.h
index 24e5fd7..8bd2482 100644
--- a/cmpsc.h
+++ b/cmpsc.h
@@ -65,10 +65,10 @@ typedef struct CMPSCBLK CMPSCBLK;
 ///////////////////////////////////////////////////////////////////////////////
 // Separate return functions for easier debugging...
 
-static CMPSC_INLINE U8 (CMPSC_FASTCALL ERR)( CMPSCBLK* pCMPSCBLK );
-static CMPSC_INLINE U8 (CMPSC_FASTCALL CC3)( CMPSCBLK* pCMPSCBLK );
-static CMPSC_INLINE U8 (CMPSC_FASTCALL CC1)( CMPSCBLK* pCMPSCBLK );
-static CMPSC_INLINE U8 (CMPSC_FASTCALL CC0)( CMPSCBLK* pCMPSCBLK );
+CMPSC_INLINE U8 (CMPSC_FASTCALL ERR)( CMPSCBLK* pCMPSCBLK );
+CMPSC_INLINE U8 (CMPSC_FASTCALL CC3)( CMPSCBLK* pCMPSCBLK );
+CMPSC_INLINE U8 (CMPSC_FASTCALL CC1)( CMPSCBLK* pCMPSCBLK );
+CMPSC_INLINE U8 (CMPSC_FASTCALL CC0)( CMPSCBLK* pCMPSCBLK );
 
 #define RETERR() return ERR( pCMPSCBLK ) // (failure)
 #define RETCC3() return CC3( pCMPSCBLK ) // (stop)
@@ -77,11 +77,11 @@ static CMPSC_INLINE U8 (CMPSC_FASTCALL CC0)( CMPSCBLK* pCMPSCBLK );
 
 typedef struct EXPBLK EXPBLK; // (fwd ref)
 
-static CMPSC_INLINE U8 (CMPSC_FASTCALL EXPOK )( CMPSCBLK* pCMPSCBLK, EXPBLK* pEXPBLK );
-static CMPSC_INLINE U8 (CMPSC_FASTCALL EXPERR)( CMPSCBLK* pCMPSCBLK, EXPBLK* pEXPBLK );
-static CMPSC_INLINE U8 (CMPSC_FASTCALL EXPCC3)( CMPSCBLK* pCMPSCBLK, EXPBLK* pEXPBLK );
-static CMPSC_INLINE U8 (CMPSC_FASTCALL EXPCC1)( CMPSCBLK* pCMPSCBLK, EXPBLK* pEXPBLK );
-static CMPSC_INLINE U8 (CMPSC_FASTCALL EXPCC0)( CMPSCBLK* pCMPSCBLK, EXPBLK* pEXPBLK );
+CMPSC_INLINE U8 (CMPSC_FASTCALL EXPOK )( CMPSCBLK* pCMPSCBLK, EXPBLK* pEXPBLK );
+CMPSC_INLINE U8 (CMPSC_FASTCALL EXPERR)( CMPSCBLK* pCMPSCBLK, EXPBLK* pEXPBLK );
+CMPSC_INLINE U8 (CMPSC_FASTCALL EXPCC3)( CMPSCBLK* pCMPSCBLK, EXPBLK* pEXPBLK );
+CMPSC_INLINE U8 (CMPSC_FASTCALL EXPCC1)( CMPSCBLK* pCMPSCBLK, EXPBLK* pEXPBLK );
+CMPSC_INLINE U8 (CMPSC_FASTCALL EXPCC0)( CMPSCBLK* pCMPSCBLK, EXPBLK* pEXPBLK );
 
 #define EXP_RETOK()  return EXPOK ( pCMPSCBLK, pEXPBLK ) // (success; keep going)
 #define EXP_RETERR() return EXPERR( pCMPSCBLK, pEXPBLK ) // (break)
diff --git a/hscutl.c b/hscutl.c
index ded92f4..3a73259 100644
--- a/hscutl.c
+++ b/hscutl.c
@@ -882,7 +882,7 @@ void socket_keepalive( int sfd, int idle_time, int probe_interval,
     if (rc) WRMSG(HHC02219, "E", "setsockopt(TCP_KEEPALIVE)", strerror(errno));
   #elif defined(TCP_KEEPIDLE)
     optval = idle_time;
-    rc = setsockopt(sfd, SOL_TCP, TCP_KEEPIDLE, &optval, sizeof(optval));
+    rc = setsockopt(sfd, IPPROTO_TCP, TCP_KEEPIDLE, &optval, sizeof(optval));
     if (rc) WRMSG(HHC02219, "E", "setsockopt(TCP_KEEPIDLE)", strerror(errno));
   #else
     UNREFERENCED(idle_time);
@@ -890,7 +890,7 @@ void socket_keepalive( int sfd, int idle_time, int probe_interval,
 
   #if defined(TCP_KEEPINTVL)
     optval = probe_interval;
-    rc = setsockopt(sfd, SOL_TCP, TCP_KEEPINTVL, &optval, sizeof(optval));
+    rc = setsockopt(sfd, IPPROTO_TCP, TCP_KEEPINTVL, &optval, sizeof(optval));
     if (rc) WRMSG(HHC02219, "E", "setsockopt(TCP_KEEPALIVE)", strerror(errno));
   #else
     UNREFERENCED(probe_interval);
@@ -898,7 +898,7 @@ void socket_keepalive( int sfd, int idle_time, int probe_interval,
 
   #if defined(TCP_KEEPCNT)
     optval = probe_count;
-    rc = setsockopt(sfd, SOL_TCP, TCP_KEEPCNT, &optval, sizeof(optval));
+    rc = setsockopt(sfd, IPPROTO_TCP, TCP_KEEPCNT, &optval, sizeof(optval));
     if (rc) WRMSG(HHC02219, "E", "setsockopt(TCPKEEPCNT)", strerror(errno));
   #else
     UNREFERENCED(probe_count);
diff --git a/hthreads.h b/hthreads.h
index ad96e21..a3fc2f0 100644
--- a/hthreads.h
+++ b/hthreads.h
@@ -12,7 +12,7 @@
 
 #if defined(HAVE_SYS_SYSCALL_H) && !defined(HAVE_GETTID)
  #include <sys/syscall.h>
- #define gettid() ((pid_t)(syscall(SYS_gettid)))
+ #define gettid() ((pid_t)(pthread_self()))
  #define USE_GETTID
 #endif
 
diff --git a/po/LINGUAS b/po/LINGUAS
index 4b82095..c06b424 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,3 +1 @@
 # Set of available languages
-nl
-de