diff --git a/legacy/evil/configure.ac b/legacy/evil/configure.ac
index 8400f4a4e7..a29d8d4825 100644
--- a/legacy/evil/configure.ac
+++ b/legacy/evil/configure.ac
@@ -2,8 +2,8 @@
 ### Version
 
 m4_define([v_maj], [0])
-m4_define([v_min], [0])
-m4_define([v_mic], [1])
+m4_define([v_min], [99])
+m4_define([v_mic], [0])
 
 m4_define([evil_version], [v_maj.v_min.v_mic])
 
@@ -47,6 +47,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 LT_PREREQ([2.4])
 LT_INIT([win32-dll])
 
+VMAJ=v_maj
+AC_SUBST(VMAJ)
+
 version_info="lt_cur:lt_rev:lt_age"
 AC_SUBST(version_info)
 
diff --git a/legacy/evil/evil.pc.in b/legacy/evil/evil.pc.in
index dd4921a36b..78669377d7 100644
--- a/legacy/evil/evil.pc.in
+++ b/legacy/evil/evil.pc.in
@@ -8,4 +8,4 @@ Description: Library that ports on Windows some specific Unix functions.
 Version: @VERSION@
 Libs: -L${libdir} -levil
 Libs.private:
-Cflags: -I${includedir}
+Cflags: -I${includedir}/evil-@VMAJ@
diff --git a/legacy/evil/src/bin/Makefile.am b/legacy/evil/src/bin/Makefile.am
index 50446d3aa6..9b974dc41b 100644
--- a/legacy/evil/src/bin/Makefile.am
+++ b/legacy/evil/src/bin/Makefile.am
@@ -21,7 +21,16 @@ evil_test_link.c \
 evil_test_memcpy.c \
 evil_test_mkstemp.c \
 evil_test_pipe.c \
-evil_test_realpath.c
+evil_test_realpath.c \
+evil_suite.h \
+evil_test_dlfcn.h \
+evil_test_environment.h \
+evil_test_gettimeofday.h \
+evil_test_link.h \
+evil_test_memcpy.h \
+evil_test_mkstemp.h \
+evil_test_pipe.h \
+evil_test_realpath.h
 
 if EVIL_HAVE_WINCE
 
@@ -39,13 +48,3 @@ evil_suite_LDFLAGS = -Wl,--enable-auto-import
 test_evil_SOURCES = test_evil.c
 test_evil_LDADD = $(top_builddir)/src/lib/libevil.la
 test_evil_LDFLAGS = -Wl,--enable-auto-import
-
-EXTRA_DIST = \
-evil_suite.h \
-evil_test_dlfcn.h \
-evil_test_environment.h \
-evil_test_link.h \
-evil_test_memcpy.h \
-evil_test_mkstemp.h \
-evil_test_pipe.h \
-evil_test_realpath.h
diff --git a/legacy/evil/src/lib/Makefile.am b/legacy/evil/src/lib/Makefile.am
index a48bcfec48..8ed473fe56 100644
--- a/legacy/evil/src/lib/Makefile.am
+++ b/legacy/evil/src/lib/Makefile.am
@@ -5,7 +5,8 @@ SUBDIRS = . dlfcn
 
 lib_LTLIBRARIES = libevil.la
 
-include_HEADERS = \
+install_evilheadersdir = $(includedir)/evil-@VMAJ@
+dist_install_evilheaders_DATA = \
 Evil.h \
 evil_fcntl.h \
 evil_inet.h \
@@ -19,11 +20,12 @@ evil_time.h \
 evil_unistd.h \
 evil_util.h
 
-nobase_include_HEADERS = pwd.h sys/mman.h fnmatch.h dirent.h
+nobase_stdheadersdir = $(includedir)/evil-@VMAJ@
+dist_nobase_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h
 
 if EVIL_HAVE_WINCE
 
-nobase_include_HEADERS += errno.h
+dist_nobase_stdheaders_DATA += errno.h
 
 endif
 
@@ -44,7 +46,9 @@ evil_string.c \
 evil_time.c \
 evil_unistd.c \
 evil_util.c \
-evil_uuid.c
+evil_uuid.c \
+evil_private.h \
+evil_fnmatch_private.h
 
 if EVIL_HAVE_WINCE
 
@@ -71,6 +75,3 @@ else
 libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS)
 
 endif
-
-
-EXTRA_DIST = evil_private.h evil_fnmatch_private.h
diff --git a/legacy/evil/src/lib/dlfcn/Makefile.am b/legacy/evil/src/lib/dlfcn/Makefile.am
index 1c2bc8244c..bb9580ca83 100644
--- a/legacy/evil/src/lib/dlfcn/Makefile.am
+++ b/legacy/evil/src/lib/dlfcn/Makefile.am
@@ -3,7 +3,10 @@ MAINTAINERCLEANFILES = Makefile.in
 
 lib_LTLIBRARIES = libdl.la
 
-include_HEADERS = dlfcn.h
+
+stdheadersdir = $(includedir)/evil-@VMAJ@
+dist_stdheaders_DATA = dlfcn.h
+
 libdl_la_SOURCES = dlfcn.c
 
 libdl_la_CPPFLAGS = -DEFL_EVIL_DLFCN_BUILD