diff -Naur graphviz-2.40.1-orig/cmd/gvmap/Makefile.am graphviz-2.40.1/cmd/gvmap/Makefile.am
--- graphviz-2.40.1-orig/cmd/gvmap/Makefile.am	2016-12-17 08:44:53.000000000 +0300
+++ graphviz-2.40.1/cmd/gvmap/Makefile.am	2017-03-15 13:55:02.393047600 +0300
@@ -42,6 +42,7 @@
 	$(top_builddir)/lib/common/libcommon_C.la \
 	$(top_builddir)/lib/edgepaint/liblab_gamut.la \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
+	$(top_builddir)/lib/gvc/libgvc.la \
 	$(GTS_LIBS) -lm
 
 cluster_LDADD = \
@@ -55,6 +56,7 @@
 	$(top_builddir)/lib/common/libcommon_C.la \
 	$(top_builddir)/lib/edgepaint/liblab_gamut.la \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
+	$(top_builddir)/lib/gvc/libgvc.la \
 	$(GTS_LIBS) -lm
 
 gvmap.sh :
diff -Naur graphviz-2.40.1-orig/cmd/edgepaint/Makefile.am graphviz-2.40.1/cmd/edgepaint/Makefile.am
--- graphviz-2.40.1-orig/cmd/edgepaint/Makefile.am	2016-12-17 08:44:53.000000000 +0300
+++ graphviz-2.40.1/cmd/edgepaint/Makefile.am	2017-03-15 13:55:02.393047600 +0300
@@ -31,6 +31,7 @@
 	$(top_builddir)/lib/edgepaint/liblab_gamut.la \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
 	$(top_builddir)/lib/cdt/libcdt.la \
+	$(top_builddir)/lib/gvc/libgvc.la \
 	$(ANN_LIBS) -lstdc++ -lm
 
 edgepaint.1.pdf: $(srcdir)/edgepaint.1
diff -Naur graphviz-2.40.1-orig/lib/gvc/Makefile.am graphviz-2.40.1/lib/gvc/Makefile.am
--- graphviz-2.40.1-orig/lib/gvc/Makefile.am	2016-12-17 08:44:53.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/Makefile.am	2017-03-15 13:55:02.393047600 +0300
@@ -19,7 +19,7 @@
 AM_CPPFLAGS += -O0
 endif
 
-LIBS = $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS)
+LIBS = $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS) -lregex
 
 pkginclude_HEADERS = gvc.h gvcext.h gvplugin.h gvcjob.h \
 	gvcommon.h gvplugin_render.h gvplugin_layout.h gvconfig.h \
diff -Naur graphviz-2.40.1-orig/lib/gvpr/Makefile.am graphviz-2.40.1/lib/gvpr/Makefile.am
--- graphviz-2.40.1-orig/lib/gvpr/Makefile.am	2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/gvpr/Makefile.am	2018-01-22 09:36:57.683164300 +0300
@@ -51,7 +51,7 @@
 libgvpr_la_DEPENDENCIES = $(libgvpr_C_la_DEPENDENCIES)
 
 if WITH_WIN32
-libgvpr_la_LDFLAGS += -export-symbols-regex gvpr
+libgvpr_la_LDFLAGS += -export-symbols-regex gvpr -lshlwapi
 endif
 
 mkdefs_SOURCES = mkdefs.c
diff -Naur graphviz-2.40.1-orig/plugin/dot_layout/Makefile.am graphviz-2.40.1/plugin/dot_layout/Makefile.am
--- graphviz-2.40.1-orig/plugin/dot_layout/Makefile.am	2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/dot_layout/Makefile.am	2018-01-19 10:34:36.164949100 +0300
@@ -22,7 +22,8 @@
 	gvplugin_dot_layout.c \
 	gvlayout_dot_layout.c
 libgvplugin_dot_layout_C_la_LIBADD = \
-	$(top_builddir)/lib/dotgen/libdotgen_C.la
+	$(top_builddir)/lib/dotgen/libdotgen_C.la \
+	$(top_builddir)/lib/ortho/libortho_C.la
 
 libgvplugin_dot_layout_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)
diff -Naur graphviz-2.40.1-orig/plugin/neato_layout/Makefile.am graphviz-2.40.1/plugin/neato_layout/Makefile.am
--- graphviz-2.40.1-orig/plugin/neato_layout/Makefile.am	2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/neato_layout/Makefile.am	2018-01-19 10:49:55.452864000 +0300
@@ -27,6 +27,7 @@
 	$(top_builddir)/lib/patchwork/libpatchwork_C.la \
 	$(top_builddir)/lib/osage/libosage_C.la \
 	$(top_builddir)/lib/fdpgen/libfdpgen_C.la \
+	$(top_builddir)/lib/ortho/libortho_C.la \
 	$(top_builddir)/lib/sparse/libsparse_C.la \
 	$(top_builddir)/lib/rbtree/librbtree_C.la \
 	$(top_builddir)/lib/circogen/libcircogen_C.la
diff -Naur graphviz-2.40.1-orig/plugin/webp/Makefile.am graphviz-2.40.1/plugin/webp/Makefile.am
--- graphviz-2.40.1-orig/plugin/webp/Makefile.am	2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/webp/Makefile.am	2018-01-19 10:49:55.452864000 +0300
@@ -27,6 +27,7 @@
 
 libgvplugin_webp_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_webp_la_SOURCES = $(libgvplugin_webp_C_la_SOURCES)
-libgvplugin_webp_la_LIBADD = @WEBP_LIBS@ @PANGOCAIRO_LIBS@
+libgvplugin_webp_la_LIBADD = @WEBP_LIBS@ @PANGOCAIRO_LIBS@ \
+	$(top_builddir)/lib/gvc/libgvc.la
 
 if WITH_WIN32
 libgvplugin_webp_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/webp/gvplugin_webp.def