From ea0fcebf0b9786d677cd46b5c902192aafa2c3db Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 28 Aug 2020 21:21:10 -0700
Subject: [PATCH] disambiguate plugin/gtk #includes

Related to #1785.
---
 plugin/gtk/Makefile.am    | 1 +
 plugin/gtk/callbacks.c    | 2 +-
 plugin/gtk/gvdevice_gtk.c | 2 +-
 plugin/gtk/gvplugin_gtk.c | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugin/gtk/Makefile.am b/plugin/gtk/Makefile.am
index cf3d25161..748064fe3 100644
--- a/plugin/gtk/Makefile.am
+++ b/plugin/gtk/Makefile.am
@@ -2,6 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+        -I$(top_srcdir)/lib \
         -I$(top_srcdir)/lib/common \
         -I$(top_srcdir)/lib/pathplan \
         -I$(top_srcdir)/lib/gvc \
diff --git a/plugin/gtk/callbacks.c b/plugin/gtk/callbacks.c
index b9dcbe327..d5e5e6599 100644
--- a/plugin/gtk/callbacks.c
+++ b/plugin/gtk/callbacks.c
@@ -15,7 +15,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_device.h>
 
 #include "callbacks.h"
 #include "interface.h"
diff --git a/plugin/gtk/gvdevice_gtk.c b/plugin/gtk/gvdevice_gtk.c
index a20c9aa88..2d02add82 100644
--- a/plugin/gtk/gvdevice_gtk.c
+++ b/plugin/gtk/gvdevice_gtk.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #endif
 
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_device.h>
 
 #ifdef HAVE_GTK
 #include <gtk/gtk.h>
diff --git a/plugin/gtk/gvplugin_gtk.c b/plugin/gtk/gvplugin_gtk.c
index 831e21337..d85da0d4c 100644
--- a/plugin/gtk/gvplugin_gtk.c
+++ b/plugin/gtk/gvplugin_gtk.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 extern gvplugin_installed_t gvdevice_types_gtk[];
 
-- 
2.40.0