From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 24 Aug 2020 01:22:05 +0000 (-0700)
Subject: disambiguate cmd/smyrna #includes
X-Git-Tag: 2.46.0~20^2^2~79^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=244c57dee6cd19ee9ed7378fa39098e0375463f5;p=graphviz

disambiguate cmd/smyrna #includes

Related to #1242 and #1785.
---

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index d3d6209ba..4b53c9e1f 100644
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -5,6 +5,7 @@ pdfdir = $(pkgdatadir)/doc/pdf
 
 AM_CPPFLAGS = \
 	-DSMYRNA_PATH=\""$(pkgdatadir)/smyrna"\" \
+        -I$(top_srcdir)/lib \
         -I$(top_srcdir)/lib/cgraph \
         -I$(top_srcdir)/lib/cdt \
         -I$(top_srcdir)/lib/glcomp \
diff --git a/cmd/smyrna/arcball.c b/cmd/smyrna/arcball.c
index 43f46808e..6fd04492d 100644
--- a/cmd/smyrna/arcball.c
+++ b/cmd/smyrna/arcball.c
@@ -25,7 +25,7 @@
 /**                                                                                 **/
 /*************************************************************************************/
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 #define ARCBALL_C
 #include "smyrnadefs.h"
 #include "arcball.h"
diff --git a/cmd/smyrna/arcball.h b/cmd/smyrna/arcball.h
index cd9749618..1f898deab 100644
--- a/cmd/smyrna/arcball.h
+++ b/cmd/smyrna/arcball.h
@@ -49,7 +49,7 @@
 
 // 8<--Snip here if you have your own math types/funcs-->8 
 
-# include "assert.h"
+# include <assert.h>
 
 //Math types derived from the KempoApi tMath library
 typedef union Tuple2f_t {
diff --git a/cmd/smyrna/btree.c b/cmd/smyrna/btree.c
index ac62b51f5..47cde7e3f 100644
--- a/cmd/smyrna/btree.c
+++ b/cmd/smyrna/btree.c
@@ -13,12 +13,12 @@
 
 #include "btree.h"
 #ifdef _WIN32
-#include "regex_win32.h"
+#include <regex_win32.h>
 #else
-#include "regex.h"
+#include <regex.h>
 #endif
 
-#include <memory.h>
+#include <common/memory.h>
 
 btree_node *new_node(char *attribute, char *regex, float min, float max)
 {
diff --git a/cmd/smyrna/btree.h b/cmd/smyrna/btree.h
index ac6d1493b..862e3b9cc 100644
--- a/cmd/smyrna/btree.h
+++ b/cmd/smyrna/btree.h
@@ -16,7 +16,7 @@
 
 #include "tvnodes.h"
 #ifdef _WIN32
-#include "regex_win32.h"
+#include <regex_win32.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/cmd/smyrna/draw.c b/cmd/smyrna/draw.c
index 519db0bbb..414fc87a8 100644
--- a/cmd/smyrna/draw.c
+++ b/cmd/smyrna/draw.c
@@ -18,18 +18,18 @@ XDOT DRAWING FUNCTIONS, maybe need to move them somewhere else
 */
 #include "draw.h"
 /* #include "topview.h" */
-#include "colorprocs.h"
+#include <common/colorprocs.h>
 #include "smyrna_utils.h"
-#include "glutils.h"
-#include "math.h"
+#include <glcomp/glutils.h>
+#include <math.h>
 
-#include "xdot.h"
+#include <xdot/xdot.h>
 #include "viewport.h"
 #include "topfisheyeview.h"
 #include "appmouse.h"
 #include "hotkeymap.h"
 #include "polytess.h"
-#include "glcompimage.h"
+#include <glcomp/glcompimage.h>
 
 
 //delta values
diff --git a/cmd/smyrna/draw.h b/cmd/smyrna/draw.h
index 96aea9ea4..3a5d6390a 100644
--- a/cmd/smyrna/draw.h
+++ b/cmd/smyrna/draw.h
@@ -15,11 +15,11 @@
 #define DRAW_H
 #include "smyrnadefs.h"
 #include <gtk/gtkgl.h>
-#include "xdot.h"
+#include <xdot/xdot.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "glcompfont.h"
+#include <glcomp/glcompfont.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cmd/smyrna/filter.c b/cmd/smyrna/filter.c
index 48d7fadaa..34db700b1 100644
--- a/cmd/smyrna/filter.c
+++ b/cmd/smyrna/filter.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 #include "filter.h"
-#include "memory.h"
+#include <common/memory.h>
 
 int clear_filter(tv_filter * f)
 {
diff --git a/cmd/smyrna/glexpose.c b/cmd/smyrna/glexpose.c
index b4f5a68aa..5c334a54f 100644
--- a/cmd/smyrna/glexpose.c
+++ b/cmd/smyrna/glexpose.c
@@ -13,7 +13,7 @@
 #include "glexpose.h"
 #include "draw.h"
 #include "topviewfuncs.h"
-#include "glutils.h"
+#include <glcomp/glutils.h>
 #include "topfisheyeview.h"
 #include "gui/toolboxcallbacks.h"
 #include "arcball.h"
diff --git a/cmd/smyrna/glmotion.c b/cmd/smyrna/glmotion.c
index 552f6fb23..dc93f3a27 100644
--- a/cmd/smyrna/glmotion.c
+++ b/cmd/smyrna/glmotion.c
@@ -18,7 +18,7 @@
 #include <gdk/gdkcursor.h>
 #include "draw.h"
 /* #include "topview.h" */
-#include "glutils.h"
+#include <glcomp/glutils.h>
 #include "hotkeymap.h"
 
 gboolean redraw = FALSE;
diff --git a/cmd/smyrna/gltemplate.c b/cmd/smyrna/gltemplate.c
index af85abdb5..8ac4857d1 100644
--- a/cmd/smyrna/gltemplate.c
+++ b/cmd/smyrna/gltemplate.c
@@ -18,11 +18,11 @@
 #include "viewport.h"
 /* #include "topview.h" */
 #include "gltemplate.h"
-#include "glutils.h"
+#include <glcomp/glutils.h>
 #include "glexpose.h"
 #include "glmotion.h"
 
-#include "glcompset.h"
+#include <glcomp/glcompset.h>
 #include "viewportcamera.h"
 #include "gui/menucallbacks.h"
 #include "arcball.h"
diff --git a/cmd/smyrna/gui/callbacks.c b/cmd/smyrna/gui/callbacks.c
index e943bd14e..ee07cf424 100644
--- a/cmd/smyrna/gui/callbacks.c
+++ b/cmd/smyrna/gui/callbacks.c
@@ -18,7 +18,7 @@
 #include "viewport.h"
 /* #include "topview.h" */
 #include "selectionfuncs.h"
-#include "memory.h"
+#include <common/memory.h>
 
 //Menu Items 
 
diff --git a/cmd/smyrna/gui/frmobjectui.c b/cmd/smyrna/gui/frmobjectui.c
index 005582b71..18008f0c2 100644
--- a/cmd/smyrna/gui/frmobjectui.c
+++ b/cmd/smyrna/gui/frmobjectui.c
@@ -20,12 +20,12 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
 #include "viewport.h"
-#include "memory.h"
+#include <common/memory.h>
 #include "frmobjectui.h"
 #include <assert.h>
-#include "sfstr.h"
+#include <ast/sfstr.h>
 #include "gvprpipe.h"
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 static attr_t *binarySearch(attr_list * l, char *searchKey);
 static int sel_node;
diff --git a/cmd/smyrna/gui/glcompui.c b/cmd/smyrna/gui/glcompui.c
index 56f36e07b..d03190c8d 100644
--- a/cmd/smyrna/gui/glcompui.c
+++ b/cmd/smyrna/gui/glcompui.c
@@ -12,12 +12,12 @@
  *************************************************************************/
 
 #include "glcompui.h"
-#include "glcompbutton.h"
-#include "glcomppanel.h"
-#include "glcomplabel.h"
-#include "glcompimage.h"
+#include <glcomp/glcompbutton.h>
+#include <glcomp/glcomppanel.h>
+#include <glcomp/glcomplabel.h>
+#include <glcomp/glcompimage.h>
 #include "gltemplate.h"
-#include "glutils.h"
+#include <glcomp/glutils.h>
 #include "glmotion.h"
 #include "topfisheyeview.h"
 #include "toolboxcallbacks.h"
diff --git a/cmd/smyrna/gui/gui.c b/cmd/smyrna/gui/gui.c
index a16ee1274..2d3ac2605 100644
--- a/cmd/smyrna/gui/gui.c
+++ b/cmd/smyrna/gui/gui.c
@@ -19,8 +19,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
 #include "viewport.h"
-#include "memory.h"
-#include "strcasecmp.h"
+#include <common/memory.h>
+#include <cgraph/strcasecmp.h>
 
 
 static char guibuffer[BUFSIZ];	//general purpose buffer
diff --git a/cmd/smyrna/gui/gui.h b/cmd/smyrna/gui/gui.h
index 3e189036d..53c5338e7 100644
--- a/cmd/smyrna/gui/gui.h
+++ b/cmd/smyrna/gui/gui.h
@@ -20,8 +20,8 @@
 #include <gtk/gtkgl.h>
 #include <glade/glade.h>
 #include "callbacks.h"
-#include "cgraph.h"
-#include <agxbuf.h>
+#include <cgraph/cgraph.h>
+#include <cgraph/agxbuf.h>
 
 #define MAXIMUM_WIDGET_COUNT	97
 
diff --git a/cmd/smyrna/gui/menucallbacks.c b/cmd/smyrna/gui/menucallbacks.c
index 48685c7f6..97604c9de 100644
--- a/cmd/smyrna/gui/menucallbacks.c
+++ b/cmd/smyrna/gui/menucallbacks.c
@@ -19,9 +19,9 @@
 #include "gvprpipe.h"
 #include "topviewsettings.h"
 #include "gltemplate.h"
-#include "memory.h"
-#include <const.h>
-#include <agxbuf.h>
+#include <common/memory.h>
+#include <common/const.h>
+#include <cgraph/agxbuf.h>
 #include <assert.h>
 #include <ctype.h>
 #include  "frmobjectui.h"
diff --git a/cmd/smyrna/gui/toolboxcallbacks.c b/cmd/smyrna/gui/toolboxcallbacks.c
index 2c1c2250c..2ff83473b 100644
--- a/cmd/smyrna/gui/toolboxcallbacks.c
+++ b/cmd/smyrna/gui/toolboxcallbacks.c
@@ -15,7 +15,7 @@
 #include "viewport.h"
 
 #include "gltemplate.h"
-#include "glutils.h"
+#include <glcomp/glutils.h>
 #include "glmotion.h"
 
 
diff --git a/cmd/smyrna/gui/topviewsettings.c b/cmd/smyrna/gui/topviewsettings.c
index 82ccd0be5..9036259c4 100644
--- a/cmd/smyrna/gui/topviewsettings.c
+++ b/cmd/smyrna/gui/topviewsettings.c
@@ -14,9 +14,9 @@
 #include "topviewfuncs.h"
 #include "topviewsettings.h"
 #include "gui.h"
-#include "colorprocs.h"
+#include <common/colorprocs.h>
 #include "viewport.h"
-#include "memory.h"
+#include <common/memory.h>
 
 void color_change_request(GtkWidget * widget, gpointer user_data)
 {
diff --git a/cmd/smyrna/gvprpipe.c b/cmd/smyrna/gvprpipe.c
index 821455dd8..ed417ed96 100644
--- a/cmd/smyrna/gvprpipe.c
+++ b/cmd/smyrna/gvprpipe.c
@@ -13,7 +13,7 @@
 
 #include "smyrnadefs.h"
 #include "gvprpipe.h"
-#include "const.h"
+#include <common/const.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -26,7 +26,7 @@
 #include <viewport.h>
 //#include <gltemplate.h> 
 
-#include <gvpr.h>
+#include <gvpr/gvpr.h>
 extern GladeXML *xml;		//global libglade vars
 
 /*    typedef struct {
diff --git a/cmd/smyrna/gvprpipe.h b/cmd/smyrna/gvprpipe.h
index 5e188411f..031a12a39 100644
--- a/cmd/smyrna/gvprpipe.h
+++ b/cmd/smyrna/gvprpipe.h
@@ -14,7 +14,7 @@
 #ifndef GVPRPIPE_H
 #define GVPRPIPE_H
 
-#include "cgraph.h"
+#include <cgraph/cgraph.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cmd/smyrna/hier.c b/cmd/smyrna/hier.c
index af94713e5..e65dd2c29 100644
--- a/cmd/smyrna/hier.c
+++ b/cmd/smyrna/hier.c
@@ -13,8 +13,8 @@
 
 #include "smyrnadefs.h"
 #include "hier.h"
-#include "delaunay.h"
-#include "memory.h"
+#include <neatogen/delaunay.h>
+#include <common/memory.h>
 
 /* scale_coords:
  */
diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c
index 5f417ebf0..b742c370e 100644
--- a/cmd/smyrna/main.c
+++ b/cmd/smyrna/main.c
@@ -28,7 +28,7 @@
 #include "support.h"
 #include "menucallbacks.h"
 #include "gltemplate.h"
-#include "memory.h"
+#include <common/memory.h>
 #include "gvprpipe.h"
 #include "frmobjectui.h"
 #ifdef ENABLE_NLS
diff --git a/cmd/smyrna/polytess.c b/cmd/smyrna/polytess.c
index 2c96d6fc1..2727045fa 100644
--- a/cmd/smyrna/polytess.c
+++ b/cmd/smyrna/polytess.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 #include "polytess.h"
-#include "xdot.h"
+#include <xdot/xdot.h>
 tessPoly TP;
 #if 0
 GLdouble star[5][3] = { 0.6f,  -0.1f, 0.0f,
diff --git a/cmd/smyrna/smyrna.vcxproj b/cmd/smyrna/smyrna.vcxproj
index b88bd1af8..557535875 100644
--- a/cmd/smyrna/smyrna.vcxproj
+++ b/cmd/smyrna/smyrna.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\freeglut.dll $(OutDir)
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
diff --git a/cmd/smyrna/smyrna_utils.c b/cmd/smyrna/smyrna_utils.c
index d4e29a33c..9cd0076de 100644
--- a/cmd/smyrna/smyrna_utils.c
+++ b/cmd/smyrna/smyrna_utils.c
@@ -11,8 +11,8 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 #include "smyrna_utils.h"
-#include "memory.h"
-#include "strcasecmp.h"
+#include <common/memory.h>
+#include <cgraph/strcasecmp.h>
 /* many of these functions are available in libcommon.
  * We cannot use those because dependencies cause a great
  * deal of libcommon to be brought in, which complicates
diff --git a/cmd/smyrna/smyrna_utils.h b/cmd/smyrna/smyrna_utils.h
index f8e45dc06..6da2a8853 100644
--- a/cmd/smyrna/smyrna_utils.h
+++ b/cmd/smyrna/smyrna_utils.h
@@ -14,7 +14,7 @@
 #define SMYRNA_UTILS_H
 
 #include "smyrnadefs.h"
-#include "cgraph.h"
+#include <cgraph/cgraph.h>
 
 extern char *xml_string(char *s);
 extern int l_int(void *obj, Agsym_t * attr, int def);
diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h
index 0106af2f2..4124675c7 100644
--- a/cmd/smyrna/smyrnadefs.h
+++ b/cmd/smyrna/smyrnadefs.h
@@ -24,16 +24,16 @@
 #define _BB
 #endif
 
-#include "xdot.h"
+#include <xdot/xdot.h>
 #include <gtk/gtk.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <gtk/gtkgl.h>
-#include "cgraph.h"
-#include "glcompset.h"
+#include <cgraph/cgraph.h>
+#include <glcomp/glcompset.h>
 #include "hier.h"
 #include "md5.h"
-#include "glutils.h"
+#include <glcomp/glutils.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cmd/smyrna/topfisheyeview.c b/cmd/smyrna/topfisheyeview.c
index e173a2587..77698e773 100644
--- a/cmd/smyrna/topfisheyeview.c
+++ b/cmd/smyrna/topfisheyeview.c
@@ -14,19 +14,19 @@
 
 //#include "glcomptext.h"
 //#include "glcomptextpng.h"
-#include "math.h"
-#include "memory.h"
+#include <math.h>
+#include <common/memory.h>
 #include "viewport.h"
 #include "viewportcamera.h"
 #include "draw.h"
 #include "smyrna_utils.h"
 
-#include "assert.h"
+#include <assert.h>
 #include "hier.h"
 #include "topfisheyeview.h"
 #include <string.h>
-#include "color.h"
-#include "colorprocs.h"
+#include <common/color.h>
+#include <common/colorprocs.h>
 
 #ifdef _WIN32
 #include <wincrypt.h>
diff --git a/cmd/smyrna/topviewdata.c b/cmd/smyrna/topviewdata.c
index 01771c463..5b34ad59d 100644
--- a/cmd/smyrna/topviewdata.c
+++ b/cmd/smyrna/topviewdata.c
@@ -13,10 +13,10 @@
 
 #include "topviewdata.h"
 #include "btree.h"
-#include "glcomppanel.h"
-#include "glcompbutton.h"
+#include <glcomp/glcomppanel.h>
+#include <glcomp/glcompbutton.h>
 
-#include <memory.h>
+#include <common/memory.h>
 
 static int validate_group_node(tv_node * TV_Node, char *regex_string)
 {
diff --git a/cmd/smyrna/topviewdata.h b/cmd/smyrna/topviewdata.h
index b02e4335b..b9b7f89eb 100644
--- a/cmd/smyrna/topviewdata.h
+++ b/cmd/smyrna/topviewdata.h
@@ -14,7 +14,7 @@
 #define TOPVIEWDATA_H
 
 #include <gtk/gtk.h>
-#include "cgraph.h"
+#include <cgraph/cgraph.h>
 #include "smyrnadefs.h"
 #include "tvnodes.h"
 
diff --git a/cmd/smyrna/topviewdefs.h b/cmd/smyrna/topviewdefs.h
index 12a0c64a5..b5b075fd9 100644
--- a/cmd/smyrna/topviewdefs.h
+++ b/cmd/smyrna/topviewdefs.h
@@ -15,7 +15,7 @@
 #include "smyrnadefs.h"
 #include "gui.h"
 #include "tvnodes.h"
-#include "glcompset.h"
+#include <glcomp/glcompset.h>
 
 
 
diff --git a/cmd/smyrna/topviewfuncs.c b/cmd/smyrna/topviewfuncs.c
index cc90415e2..3c8eb5fa3 100644
--- a/cmd/smyrna/topviewfuncs.c
+++ b/cmd/smyrna/topviewfuncs.c
@@ -12,15 +12,15 @@
  *************************************************************************/
 
 #include "topviewfuncs.h"
-#include "cgraph.h"
+#include <cgraph/cgraph.h>
 #include "smyrna_utils.h"
-#include "colorprocs.h"
+#include <common/colorprocs.h>
 #include "draw.h"
 #include "frmobjectui.h"
-#include "xdot.h"
-#include "glutils.h"
+#include <xdot/xdot.h>
+#include <glcomp/glutils.h>
 #include "selectionfuncs.h"
-#include "memory.h"
+#include <common/memory.h>
 #include <ctype.h>
 
 static xdot *parseXdotwithattrs(void *e)
diff --git a/cmd/smyrna/tvnodes.c b/cmd/smyrna/tvnodes.c
index 664b5f912..cd94e7b16 100644
--- a/cmd/smyrna/tvnodes.c
+++ b/cmd/smyrna/tvnodes.c
@@ -14,7 +14,7 @@
 #include "tvnodes.h"
 #include "viewport.h"
 #include "topviewfuncs.h"
-#include "memory.h"
+#include <common/memory.h>
 
 typedef struct {
     GType type;
diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c
index 1850d5878..964c3bc15 100644
--- a/cmd/smyrna/viewport.c
+++ b/cmd/smyrna/viewport.c
@@ -14,26 +14,26 @@
 #include <windows.h>
 #include <io.h>
 #else
-#include "unistd.h"
+#include <unistd.h>
 #endif
 #include "viewport.h"
 #include "draw.h"
-#include "color.h"
+#include <common/color.h>
 #include <glade/glade.h>
 #include "gui.h"
 #include "menucallbacks.h"
-#include "string.h"
+#include <string.h>
 #include "glcompui.h"
 /* #include "topview.h" */
 #include "gltemplate.h"
-#include "colorprocs.h"
-#include "memory.h"
+#include <common/colorprocs.h>
+#include <common/memory.h>
 #include "topviewsettings.h"
 #include "md5.h"
 #include "arcball.h"
 #include "hotkeymap.h"
 #include "topviewfuncs.h"
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 
   /* Forward declarations */
diff --git a/cmd/smyrna/viewport.h b/cmd/smyrna/viewport.h
index c337de6b6..deacd17ef 100644
--- a/cmd/smyrna/viewport.h
+++ b/cmd/smyrna/viewport.h
@@ -17,8 +17,8 @@
 #define bool int
 #include "smyrnadefs.h"
 #include <gtk/gtk.h>
-#include "xdot.h"
-#include "cgraph.h"
+#include <xdot/xdot.h>
+#include <cgraph/cgraph.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cmd/smyrna/viewportcamera.c b/cmd/smyrna/viewportcamera.c
index 82fa9d284..57aeaab23 100644
--- a/cmd/smyrna/viewportcamera.c
+++ b/cmd/smyrna/viewportcamera.c
@@ -13,11 +13,11 @@
 
 #include "viewportcamera.h"
 #include "gui.h"
-#include "math.h"
-#include "memory.h"
-#include "glcompbutton.h"
-#include "glcomplabel.h"
-#include "glcomppanel.h"
+#include <math.h>
+#include <common/memory.h>
+#include <glcomp/glcompbutton.h>
+#include <glcomp/glcomplabel.h>
+#include <glcomp/glcomppanel.h>
 
 
 static viewport_camera *new_viewport_camera(ViewInfo * view)
diff --git a/cmd/smyrna/viewportcamera.h b/cmd/smyrna/viewportcamera.h
index d3eb26832..075f43b4e 100644
--- a/cmd/smyrna/viewportcamera.h
+++ b/cmd/smyrna/viewportcamera.h
@@ -14,7 +14,7 @@
 #define VIEWPORTCAMERA_H
 
 #include "smyrnadefs.h"
-#include "glcompset.h"
+#include <glcomp/glcompset.h>
 
 #ifdef __cplusplus
 extern "C" {