Index: nghttp2-1.31.1/configure
===================================================================
--- nghttp2-1.31.1/configure
+++ nghttp2-1.31.1/configure	2018-04-18 14:29:22.715660370 +0200
@@ -19068,7 +19068,7 @@
 fi
 
 if test "x${have_libev}" = "xyes"; then
-  ac_fn_c_check_header_mongrel "$LINENO" "ev.h" "ac_cv_header_ev_h" "$ac_includes_default"
+  ac_fn_c_check_header_mongrel "$LINENO" "libev/ev.h" "ac_cv_header_ev_h" "$ac_includes_default"
 if test "x$ac_cv_header_ev_h" = xyes; then :
   have_libev=yes
 else
Index: nghttp2-1.31.1/configure.ac
===================================================================
--- nghttp2-1.31.1/configure.ac
+++ nghttp2-1.31.1/configure.ac	2018-04-18 14:30:00.515656893 +0200
@@ -343,7 +343,7 @@
 # android requires -lm for floor
 AC_CHECK_LIB([ev], [ev_time], [have_libev=yes], [have_libev=no], [-lm])
 if test "x${have_libev}" = "xyes"; then
-  AC_CHECK_HEADER([ev.h], [have_libev=yes], [have_libev=no])
+  AC_CHECK_HEADER([libev/ev.h], [have_libev=yes], [have_libev=no])
   if test "x${have_libev}" = "xyes"; then
     LIBEV_LIBS=-lev
     LIBEV_CFLAGS=
Index: nghttp2-1.31.1/src/HttpServer.h
===================================================================
--- nghttp2-1.31.1/src/HttpServer.h
+++ nghttp2-1.31.1/src/HttpServer.h	2018-04-18 14:30:43.615652936 +0200
@@ -39,7 +39,7 @@
 
 #include <openssl/ssl.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
Index: nghttp2-1.31.1/src/h2load.h
===================================================================
--- nghttp2-1.31.1/src/h2load.h
+++ nghttp2-1.31.1/src/h2load.h	2018-04-18 14:30:31.735654027 +0200
@@ -45,7 +45,7 @@
 
 #include <nghttp2/nghttp2.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <openssl/ssl.h>
 
Index: nghttp2-1.31.1/src/nghttp.h
===================================================================
--- nghttp2-1.31.1/src/nghttp.h
+++ nghttp2-1.31.1/src/nghttp.h	2018-04-18 14:31:00.235651413 +0200
@@ -43,7 +43,7 @@
 
 #include <openssl/ssl.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
Index: nghttp2-1.31.1/src/shrpx.cc
===================================================================
--- nghttp2-1.31.1/src/shrpx.cc
+++ nghttp2-1.31.1/src/shrpx.cc	2018-04-18 14:31:54.005645583 +0200
@@ -71,7 +71,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
Index: nghttp2-1.31.1/src/shrpx_accept_handler.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_accept_handler.h
+++ nghttp2-1.31.1/src/shrpx_accept_handler.h	2018-04-18 14:31:28.525648570 +0200
@@ -27,7 +27,7 @@
 
 #include "shrpx.h"
 
-#include <ev.h>
+#include <libev/ev.h>
 
 namespace shrpx {
 
Index: nghttp2-1.31.1/src/shrpx_client_handler.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_client_handler.h
+++ nghttp2-1.31.1/src/shrpx_client_handler.h	2018-04-18 14:32:19.375642607 +0200
@@ -29,7 +29,7 @@
 
 #include <memory>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <openssl/ssl.h>
 
Index: nghttp2-1.31.1/src/shrpx_config.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_config.h
+++ nghttp2-1.31.1/src/shrpx_config.h	2018-04-18 14:32:38.065640409 +0200
@@ -46,7 +46,7 @@
 
 #include <openssl/ssl.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
Index: nghttp2-1.31.1/src/shrpx_connect_blocker.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_connect_blocker.h
+++ nghttp2-1.31.1/src/shrpx_connect_blocker.h	2018-04-18 14:32:56.645638233 +0200
@@ -30,7 +30,7 @@
 #include <random>
 #include <functional>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 namespace shrpx {
 
Index: nghttp2-1.31.1/src/shrpx_connection.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_connection.h
+++ nghttp2-1.31.1/src/shrpx_connection.h	2018-04-18 14:33:19.195635591 +0200
@@ -29,7 +29,7 @@
 
 #include <sys/uio.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <openssl/ssl.h>
 
Index: nghttp2-1.31.1/src/shrpx_connection_handler.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_connection_handler.h
+++ nghttp2-1.31.1/src/shrpx_connection_handler.h	2018-04-18 14:33:36.365633570 +0200
@@ -42,7 +42,7 @@
 
 #include <openssl/ssl.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #ifdef HAVE_NEVERBLEED
 #  include <neverbleed.h>
Index: nghttp2-1.31.1/src/shrpx_dns_resolver.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_dns_resolver.h
+++ nghttp2-1.31.1/src/shrpx_dns_resolver.h	2018-04-18 14:33:55.005631387 +0200
@@ -32,7 +32,7 @@
 
 #include <vector>
 
-#include <ev.h>
+#include <libev/ev.h>
 #include <ares.h>
 
 #include "template.h"
Index: nghttp2-1.31.1/src/shrpx_downstream.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_downstream.h
+++ nghttp2-1.31.1/src/shrpx_downstream.h	2018-04-18 14:34:12.545629331 +0200
@@ -34,7 +34,7 @@
 #include <chrono>
 #include <algorithm>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
Index: nghttp2-1.31.1/src/shrpx_dual_dns_resolver.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_dual_dns_resolver.h
+++ nghttp2-1.31.1/src/shrpx_dual_dns_resolver.h	2018-04-18 14:34:27.945627529 +0200
@@ -27,7 +27,7 @@
 
 #include "shrpx.h"
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include "shrpx_dns_resolver.h"
 
Index: nghttp2-1.31.1/src/shrpx_http2_session.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_http2_session.h
+++ nghttp2-1.31.1/src/shrpx_http2_session.h	2018-04-18 14:34:42.865625772 +0200
@@ -32,7 +32,7 @@
 
 #include <openssl/ssl.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
Index: nghttp2-1.31.1/src/shrpx_http2_upstream.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_http2_upstream.h
+++ nghttp2-1.31.1/src/shrpx_http2_upstream.h	2018-04-18 14:34:58.705623919 +0200
@@ -29,7 +29,7 @@
 
 #include <memory>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
Index: nghttp2-1.31.1/src/shrpx_io_control.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_io_control.h
+++ nghttp2-1.31.1/src/shrpx_io_control.h	2018-04-18 14:35:13.145622223 +0200
@@ -30,7 +30,7 @@
 #include <cinttypes>
 #include <vector>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include "shrpx_rate_limit.h"
 
Index: nghttp2-1.31.1/src/shrpx_live_check.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_live_check.h
+++ nghttp2-1.31.1/src/shrpx_live_check.h	2018-04-18 14:35:28.335620438 +0200
@@ -32,7 +32,7 @@
 
 #include <openssl/ssl.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
Index: nghttp2-1.31.1/src/shrpx_memcached_connection.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_memcached_connection.h
+++ nghttp2-1.31.1/src/shrpx_memcached_connection.h	2018-04-18 14:35:45.505618430 +0200
@@ -30,7 +30,7 @@
 #include <memory>
 #include <deque>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include "shrpx_connection.h"
 #include "shrpx_tls.h"
Index: nghttp2-1.31.1/src/shrpx_memcached_dispatcher.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_memcached_dispatcher.h
+++ nghttp2-1.31.1/src/shrpx_memcached_dispatcher.h	2018-04-18 14:35:58.935616850 +0200
@@ -30,7 +30,7 @@
 #include <memory>
 #include <random>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <openssl/ssl.h>
 
Index: nghttp2-1.31.1/src/shrpx_rate_limit.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_rate_limit.h
+++ nghttp2-1.31.1/src/shrpx_rate_limit.h	2018-04-18 14:36:15.235614940 +0200
@@ -27,7 +27,7 @@
 
 #include "shrpx.h"
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <openssl/ssl.h>
 
Index: nghttp2-1.31.1/src/shrpx_tls.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_tls.h
+++ nghttp2-1.31.1/src/shrpx_tls.h	2018-04-18 14:37:05.005609100 +0200
@@ -33,7 +33,7 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #ifdef HAVE_NEVERBLEED
 #  include <neverbleed.h>
Index: nghttp2-1.31.1/src/shrpx_worker.h
===================================================================
--- nghttp2-1.31.1/src/shrpx_worker.h
+++ nghttp2-1.31.1/src/shrpx_worker.h	2018-04-18 14:37:21.785607134 +0200
@@ -40,7 +40,7 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include "shrpx_config.h"
 #include "shrpx_downstream_connection_pool.h"
Index: nghttp2-1.31.1/src/shrpx_worker_process.cc
===================================================================
--- nghttp2-1.31.1/src/shrpx_worker_process.cc
+++ nghttp2-1.31.1/src/shrpx_worker_process.cc	2018-04-18 14:37:38.845605128 +0200
@@ -37,7 +37,7 @@
 
 #include <openssl/rand.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <ares.h>