diff --git a/Makefile.in b/Makefile.in
index 25af140c..e1f8d9c2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -130,9 +130,12 @@ $(objdir)/sysdep/paths.h: Makefile
 tests_targets_ok = $(addsuffix .ok,$(tests_targets))
 
 $(tests_targets): %: %.o $(tests_objs)
-	$(E)echo LD $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(E)echo LD $(LDFLAGS) -o $@ $< "..." $(LIBS)
 	$(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
+# Hack to avoid problems with tests linking everything
+$(tests_targets): LIBS += $(DAEMON_LIBS)
+
 $(tests_targets_ok): %.ok: %
 	$(Q)$* 2>/dev/null && touch $*.ok
 
diff --git a/configure.ac b/configure.ac
index afadac2e..9e375762 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,8 +222,8 @@ DAEMON_LIBS=
 AC_SUBST(DAEMON_LIBS)
 
 if test "$enable_libssh" != no ; then
-  AC_CHECK_HEADER([libssh/libssh.h], [ ], [fail=yes], [ ])
-  AC_CHECK_LIB([ssh], [ssh_connect], [ ], [fail=yes])
+  AC_CHECK_HEADER([libssh/libssh.h], [true], [fail=yes], [ ])
+  AC_CHECK_LIB([ssh], [ssh_connect], [true], [fail=yes])
 
   if test "$fail" != yes ; then
     AC_DEFINE([HAVE_LIBSSH], [1], [Define to 1 if you have the `ssh' library (-lssh).])
@@ -275,7 +275,11 @@ case $sysdesc in
     AC_CHECK_HEADER([linux/rtnetlink.h],
       [],
       [AC_MSG_ERROR([Appropriate version of Linux kernel headers not found.])],
-      [] dnl Force new AC_CHECK_HEADER semantics
+      [
+	dnl Some older versions of Linux kernel headers require these includes
+	#include <asm/types.h>
+	#include <sys/socket.h>
+      ]
     )
     ;;
 esac
@@ -334,7 +338,7 @@ if test "$enable_client" = yes ; then
   AC_CHECK_HEADERS([curses.h],
     [],
     [AC_MSG_ERROR([The client requires ncurses library. Either install the library or use --disable-client to compile without the client.])],
-    [] dnl Force new AC_CHECK_HEADER semantics
+    [AC_INCLUDES_DEFAULT]
   )
 
   AC_SEARCH_LIBS([tgetent], [tinfo tinfow ncurses curses termcap],
@@ -345,12 +349,7 @@ if test "$enable_client" = yes ; then
   AC_CHECK_HEADERS([readline/readline.h readline/history.h],
     [],
     [AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])],
-    [] dnl Force new AC_CHECK_HEADER semantics
-  )
-
-  AC_SEARCH_LIBS([add_history], [history],
-    [HISTORY_LIBS="$LIBS"; LIBS=""],
-    [AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])],
+    [AC_INCLUDES_DEFAULT]
   )
 
   AC_SEARCH_LIBS([rl_callback_read_char], [readline],
@@ -359,6 +358,12 @@ if test "$enable_client" = yes ; then
     [$TINFO_LIBS]
   )
 
+  AC_SEARCH_LIBS([add_history], [history readline],
+    [HISTORY_LIBS="$LIBS"; LIBS=""],
+    [AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])],
+    [$TINFO_LIBS]
+  )
+
   AC_CHECK_LIB([readline], [rl_crlf],
     [AC_DEFINE([HAVE_RL_CRLF], [1], [Define to 1 if you have rl_crlf()])],
     [],
@@ -372,7 +377,7 @@ if test "$enable_client" = yes ; then
   )
 
   LIBS="$BASE_LIBS"
-  CLIENT_LIBS="$READLINE_LIBS $HISTORY_LIBS $TINFO_LIBS"
+  CLIENT_LIBS="$HISTORY_LIBS $READLINE_LIBS $TINFO_LIBS"
 fi
 AC_SUBST([CLIENT])
 AC_SUBST([CLIENT_LIBS])