diff --git a/lib/hostip.c b/lib/hostip.c
index 640010c94a..a0e1d40c81 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -40,7 +40,7 @@
 #include <inet.h>
 #endif
 
-#include <setjmp.h>
+#include <setjmp.h>  /* for sigjmp_buf, sigsetjmp() */
 #include <signal.h>
 
 #include "urldata.h"
diff --git a/lib/hostip.h b/lib/hostip.h
index a40e24b88e..712b8eaf1b 100644
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -31,8 +31,6 @@
 #include "asyn.h"
 #include "httpsrr.h"
 
-#include <setjmp.h>
-
 #ifdef USE_HTTPSRR
 # include <stdint.h>
 #endif
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index 8c40c40b34..6902b39e7d 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -61,7 +61,7 @@
 #include <sys/filio.h>  /* FIONREAD on Solaris 7 */
 #endif
 
-#include <setjmp.h>
+#include <setjmp.h>  /* for sigjmp_buf, sigsetjmp() */
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>