From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 19 Aug 2020 03:51:14 +0000 (-0700)
Subject: disambiguate lib/neatogen/*.c #includes
X-Git-Tag: 2.46.0~20^2^2~90^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d637d1f59964d208fe440b942e8f8c3d8ee560cf;p=graphviz

disambiguate lib/neatogen/*.c #includes

Related to #1785.
---

diff --git a/lib/neatogen/CMakeLists.txt b/lib/neatogen/CMakeLists.txt
index 7e1780d20..5d4f032b7 100644
--- a/lib/neatogen/CMakeLists.txt
+++ b/lib/neatogen/CMakeLists.txt
@@ -1,17 +1,3 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_LIB_DIR}/common
-    ${GRAPHVIZ_LIB_DIR}/gvc
-    ${GRAPHVIZ_LIB_DIR}/ortho
-    ${GRAPHVIZ_LIB_DIR}/pack
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GRAPHVIZ_LIB_DIR}/rbtree
-    ${GRAPHVIZ_LIB_DIR}/sfdpgen
-    ${GRAPHVIZ_LIB_DIR}/sparse
-)
-
 set(sources
     # Header files
     adjust.h
@@ -98,10 +84,25 @@ if (with_ipsepcola)
         mosek_quad_solve.h
         quad_prog_vpsc.c
     )
-    include_directories(${GRAPHVIZ_LIB_DIR}/vpsc)
+    target_include_directories(${GRAPHVIZ_LIB_DIR}/vpsc)
 endif (with_ipsepcola)
 
 
 add_library(neatogen STATIC
     ${sources}
 )
+
+target_include_directories(neatogen PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GRAPHVIZ_LIB_DIR}/cdt
+    ${GRAPHVIZ_LIB_DIR}/cgraph
+    ${GRAPHVIZ_LIB_DIR}/common
+    ${GRAPHVIZ_LIB_DIR}/gvc
+    ${GRAPHVIZ_LIB_DIR}/ortho
+    ${GRAPHVIZ_LIB_DIR}/pack
+    ${GRAPHVIZ_LIB_DIR}/pathplan
+    ${GRAPHVIZ_LIB_DIR}/rbtree
+    ${GRAPHVIZ_LIB_DIR}/sfdpgen
+    ${GRAPHVIZ_LIB_DIR}/sparse
+)
diff --git a/lib/neatogen/Makefile.am b/lib/neatogen/Makefile.am
index 97aac9fdb..6c09d991a 100644
--- a/lib/neatogen/Makefile.am
+++ b/lib/neatogen/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/gvc \
         -I$(top_srcdir)/lib/pack \
diff --git a/lib/neatogen/adjust.c b/lib/neatogen/adjust.c
index a42c24f73..6734bc36c 100644
--- a/lib/neatogen/adjust.c
+++ b/lib/neatogen/adjust.c
@@ -16,25 +16,25 @@
  * order to reduce/remove node overlaps.
  */
 
-#include "neato.h"
-#include "agxbuf.h"
-#include "utils.h"
-#include "ctype.h"
-#include "voronoi.h"
-#include "info.h"
-#include "edges.h"
-#include "site.h"
-#include "heap.h"
-#include "hedges.h"
-#include "digcola.h"
+#include <neatogen/neato.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
+#include <ctype.h>
+#include <neatogen/voronoi.h>
+#include <neatogen/info.h>
+#include <neatogen/edges.h>
+#include <neatogen/site.h>
+#include <neatogen/heap.h>
+#include <neatogen/hedges.h>
+#include <neatogen/digcola.h>
 #if ((defined(HAVE_GTS) || defined(HAVE_TRIANGLE)) && defined(SFDP))
-#include "overlap.h"
+#include <neatogen/overlap.h>
 #endif
 #ifdef IPSEPCOLA
-#include "csolve_VPSC.h"
-#include "quad_prog_vpsc.h"
+#include <vpsc/csolve_VPSC.h>
+#include <neatogen/quad_prog_vpsc.h>
 #endif
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 #define SEPFACT         0.8  /* default esep/sep */
 
diff --git a/lib/neatogen/bfs.c b/lib/neatogen/bfs.c
index 4ba169479..6b0a84a92 100644
--- a/lib/neatogen/bfs.c
+++ b/lib/neatogen/bfs.c
@@ -20,7 +20,7 @@
 
 ******************************************/
 
-#include "bfs.h"
+#include <neatogen/bfs.h>
 #include <stdlib.h>
 /* #include <math.h> */
 
diff --git a/lib/neatogen/call_tri.c b/lib/neatogen/call_tri.c
index cf6605bf4..611c5d244 100644
--- a/lib/neatogen/call_tri.c
+++ b/lib/neatogen/call_tri.c
@@ -13,10 +13,10 @@
 
 #include "config.h"
 
-#include "SparseMatrix.h"
-#include "logic.h"
-#include "memory.h"
-#include "delaunay.h"
+#include <sparse/SparseMatrix.h>
+#include <common/logic.h>
+#include <common/memory.h>
+#include <neatogen/delaunay.h>
 
 SparseMatrix call_tri(int n, int dim, real * x)
 {
diff --git a/lib/neatogen/circuit.c b/lib/neatogen/circuit.c
index d04fa0581..2df45fdcb 100644
--- a/lib/neatogen/circuit.c
+++ b/lib/neatogen/circuit.c
@@ -17,7 +17,7 @@
  * likely it could be improved by using edge weights, somehow.
  * Return 1 if successful; 0 otherwise (e.g., graph is disconnected).
  */
-#include	"neato.h"
+#include	<neatogen/neato.h>
 
 int solveCircuit(int nG, double **Gm, double **Gm_inv)
 {
diff --git a/lib/neatogen/closest.c b/lib/neatogen/closest.c
index 15516f4c2..e75a3113c 100644
--- a/lib/neatogen/closest.c
+++ b/lib/neatogen/closest.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 
-#include "kkutils.h"
-#include "closest.h"
+#include <neatogen/kkutils.h>
+#include <neatogen/closest.h>
 #include <stdlib.h>
 
 /*****************************************
diff --git a/lib/neatogen/compute_hierarchy.c b/lib/neatogen/compute_hierarchy.c
index 4f9528907..11d05b497 100644
--- a/lib/neatogen/compute_hierarchy.c
+++ b/lib/neatogen/compute_hierarchy.c
@@ -11,9 +11,9 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include <digcola.h>
+#include <neatogen/digcola.h>
 #ifdef DIGCOLA
-#include "kkutils.h"
+#include <neatogen/kkutils.h>
 
 static int *given_levels = NULL;
 /*
diff --git a/lib/neatogen/conjgrad.c b/lib/neatogen/conjgrad.c
index b90f0a409..c1918e60b 100644
--- a/lib/neatogen/conjgrad.c
+++ b/lib/neatogen/conjgrad.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 
-#include "matrix_ops.h"
-#include "conjgrad.h"
+#include <neatogen/matrix_ops.h>
+#include <neatogen/conjgrad.h>
 /* #include <math.h> */
 #include <stdlib.h>
 
diff --git a/lib/neatogen/constrained_majorization.c b/lib/neatogen/constrained_majorization.c
index b5802bd16..cc5633908 100644
--- a/lib/neatogen/constrained_majorization.c
+++ b/lib/neatogen/constrained_majorization.c
@@ -11,21 +11,21 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef DIGCOLA
 #include <math.h>
 #include <stdlib.h>
 #include <time.h>
 #include <stdio.h>
 #include <float.h>
-#include "stress.h"
-#include "dijkstra.h"
-#include "bfs.h"
-#include "matrix_ops.h"
-#include "kkutils.h"
-#include "conjgrad.h"
-#include "quad_prog_solver.h"
-#include "matrix_ops.h"
+#include <neatogen/stress.h>
+#include <neatogen/dijkstra.h>
+#include <neatogen/bfs.h>
+#include <neatogen/matrix_ops.h>
+#include <neatogen/kkutils.h>
+#include <neatogen/conjgrad.h>
+#include <neatogen/quad_prog_solver.h>
+#include <neatogen/matrix_ops.h>
 
 #define localConstrMajorIterations 15
 #define levels_sep_tol 1e-1
diff --git a/lib/neatogen/constrained_majorization_ipsep.c b/lib/neatogen/constrained_majorization_ipsep.c
index cd0540251..c10d68e6c 100644
--- a/lib/neatogen/constrained_majorization_ipsep.c
+++ b/lib/neatogen/constrained_majorization_ipsep.c
@@ -34,23 +34,23 @@
  * Tim Dwyer, 2006
  **********************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef IPSEPCOLA
 #include <math.h>
 #include <stdlib.h>
 #include <time.h>
 #include <stdio.h>
 #include <float.h>
-#include "stress.h"
-#include "dijkstra.h"
-#include "bfs.h"
-#include "matrix_ops.h"
-#include "kkutils.h"
-#include "conjgrad.h"
-#include <csolve_VPSC.h>
-#include "quad_prog_vpsc.h"
-#include "quad_prog_solver.h"
-#include "matrix_ops.h"
+#include <neatogen/stress.h>
+#include <neatogen/dijkstra.h>
+#include <neatogen/bfs.h>
+#include <neatogen/matrix_ops.h>
+#include <neatogen/kkutils.h>
+#include <neatogen/conjgrad.h>
+#include <vpsc/csolve_VPSC.h>
+#include <neatogen/quad_prog_vpsc.h>
+#include <neatogen/quad_prog_solver.h>
+#include <neatogen/matrix_ops.h>
 
 #define localConstrMajorIterations 1000
 
diff --git a/lib/neatogen/constraint.c b/lib/neatogen/constraint.c
index 87873f31b..01f8893f0 100644
--- a/lib/neatogen/constraint.c
+++ b/lib/neatogen/constraint.c
@@ -14,8 +14,8 @@
 
 #include "config.h"
 
-#include "neato.h"
-#include "adjust.h"
+#include <neatogen/neato.h>
+#include <neatogen/adjust.h>
 
 /* For precision, scale up before algorithms, then scale down */
 #define SCALE 10   
diff --git a/lib/neatogen/delaunay.c b/lib/neatogen/delaunay.c
index ab39c09ea..aa0c334ae 100644
--- a/lib/neatogen/delaunay.c
+++ b/lib/neatogen/delaunay.c
@@ -17,10 +17,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "cgraph.h"     /* for agerr() and friends */
-#include "delaunay.h"
-#include "memory.h"
-#include "logic.h"
+#include <cgraph/cgraph.h>     /* for agerr() and friends */
+#include <neatogen/delaunay.h>
+#include <common/memory.h>
+#include <common/logic.h>
 
 #if HAVE_GTS
 #include <gts.h>
@@ -540,9 +540,9 @@ freeSurface (surface_t* s)
 }
 #elif HAVE_TRIANGLE
 #define TRILIBRARY
-#include "triangle.c"
-#include "assert.h"
-#include "general.h"
+#include <triangle.c>
+#include <assert.h>
+#include <sparse/general.h>
 
 int*
 get_triangles (double *x, int n, int* tris)
diff --git a/lib/neatogen/dijkstra.c b/lib/neatogen/dijkstra.c
index 0fec6482a..f5c3c1909 100644
--- a/lib/neatogen/dijkstra.c
+++ b/lib/neatogen/dijkstra.c
@@ -21,8 +21,8 @@
 ******************************************/
 
 
-#include "bfs.h"
-#include "dijkstra.h"
+#include <neatogen/bfs.h>
+#include <neatogen/dijkstra.h>
 #include <limits.h>
 #include <stdlib.h>
 /* #include <math.h> */
diff --git a/lib/neatogen/edges.c b/lib/neatogen/edges.c
index 168ad5a3b..c3bb89ea7 100644
--- a/lib/neatogen/edges.c
+++ b/lib/neatogen/edges.c
@@ -11,10 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "neato.h"
-#include "mem.h"
-#include "info.h"
-#include "edges.h"
+#include <neatogen/neato.h>
+#include <neatogen/mem.h>
+#include <neatogen/info.h>
+#include <neatogen/edges.h>
 #include <math.h>
 
 
diff --git a/lib/neatogen/embed_graph.c b/lib/neatogen/embed_graph.c
index d6ffe7318..91f002ae1 100644
--- a/lib/neatogen/embed_graph.c
+++ b/lib/neatogen/embed_graph.c
@@ -20,10 +20,10 @@
 ************************************************/
 
 
-#include "dijkstra.h"
-#include "bfs.h"
-#include "kkutils.h"
-#include "embed_graph.h"
+#include <neatogen/dijkstra.h>
+#include <neatogen/bfs.h>
+#include <neatogen/kkutils.h>
+#include <neatogen/embed_graph.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
diff --git a/lib/neatogen/geometry.c b/lib/neatogen/geometry.c
index 8760b2f45..916e936d3 100644
--- a/lib/neatogen/geometry.c
+++ b/lib/neatogen/geometry.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "geometry.h"
+#include <neatogen/geometry.h>
 #include <math.h>
 
 
diff --git a/lib/neatogen/gvneatogen.vcxproj b/lib/neatogen/gvneatogen.vcxproj
index c66148128..da174636c 100644
--- a/lib/neatogen/gvneatogen.vcxproj
+++ b/lib/neatogen/gvneatogen.vcxproj
@@ -52,7 +52,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -71,7 +71,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
diff --git a/lib/neatogen/heap.c b/lib/neatogen/heap.c
index f101fc9ba..66c644833 100644
--- a/lib/neatogen/heap.c
+++ b/lib/neatogen/heap.c
@@ -12,12 +12,12 @@
  *************************************************************************/
 
 
-#include "render.h"
+#include <common/render.h>
 #include <stdio.h>
 
-#include "mem.h"
-#include "hedges.h"
-#include "heap.h"
+#include <neatogen/mem.h>
+#include <neatogen/hedges.h>
+#include <neatogen/heap.h>
 
 
 static Halfedge *PQhash;
diff --git a/lib/neatogen/hedges.c b/lib/neatogen/hedges.c
index 3e205c49f..7af3299cd 100644
--- a/lib/neatogen/hedges.c
+++ b/lib/neatogen/hedges.c
@@ -11,9 +11,9 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "mem.h"
-#include "hedges.h"
-#include "render.h"
+#include <neatogen/mem.h>
+#include <neatogen/hedges.h>
+#include <common/render.h>
 
 
 #define DELETED -2
diff --git a/lib/neatogen/info.c b/lib/neatogen/info.c
index c7b38e3a9..d414cb3bd 100644
--- a/lib/neatogen/info.c
+++ b/lib/neatogen/info.c
@@ -11,10 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "neato.h"
+#include <neatogen/neato.h>
 #include <stdio.h>
-#include "mem.h"
-#include "info.h"
+#include <neatogen/mem.h>
+#include <neatogen/info.h>
 
 
 Info_t *nodeInfo;		/* Array of node info */
diff --git a/lib/neatogen/kkutils.c b/lib/neatogen/kkutils.c
index 0c9f07abe..164d28f66 100644
--- a/lib/neatogen/kkutils.c
+++ b/lib/neatogen/kkutils.c
@@ -12,9 +12,9 @@
  *************************************************************************/
 
 
-#include "bfs.h"
-#include "dijkstra.h"
-#include "kkutils.h"
+#include <neatogen/bfs.h>
+#include <neatogen/dijkstra.h>
+#include <neatogen/kkutils.h>
 #include <stdlib.h>
 #include <math.h>
 
diff --git a/lib/neatogen/legal.c b/lib/neatogen/legal.c
index 58d85e441..6f48c7385 100644
--- a/lib/neatogen/legal.c
+++ b/lib/neatogen/legal.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 #include <math.h>
-#include "neato.h"
-#include "pathutil.h"
+#include <neatogen/neato.h>
+#include <pathplan/pathutil.h>
 #include <setjmp.h>
 
 static jmp_buf jbuf;
diff --git a/lib/neatogen/lu.c b/lib/neatogen/lu.c
index aaebf736d..c993f480d 100644
--- a/lib/neatogen/lu.c
+++ b/lib/neatogen/lu.c
@@ -46,7 +46,7 @@
  */
 
 #include <math.h>
-#include <neato.h>
+#include <neatogen/neato.h>
 
 static double *scales;
 static double **lu;
diff --git a/lib/neatogen/matinv.c b/lib/neatogen/matinv.c
index a2ab1372e..0f297c38c 100644
--- a/lib/neatogen/matinv.c
+++ b/lib/neatogen/matinv.c
@@ -35,7 +35,7 @@
  */
 
 #include <stdlib.h>
-#include "render.h"
+#include <common/render.h>
 extern int lu_decompose(double **a, int n);
 extern void lu_solve(double *x, double *b, int n);
 
diff --git a/lib/neatogen/matrix_ops.c b/lib/neatogen/matrix_ops.c
index cc0531e74..c5c626277 100644
--- a/lib/neatogen/matrix_ops.c
+++ b/lib/neatogen/matrix_ops.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 
-#include "matrix_ops.h"
-#include "memory.h"
+#include <neatogen/matrix_ops.h>
+#include <common/memory.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/lib/neatogen/memory.c b/lib/neatogen/memory.c
index 5d5c4c19b..1fb993787 100644
--- a/lib/neatogen/memory.c
+++ b/lib/neatogen/memory.c
@@ -11,8 +11,8 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "geometry.h"
-#include "render.h"
+#include <neatogen/geometry.h>
+#include <common/render.h>
 
 typedef struct freenode {
     struct freenode *nextfree;
@@ -23,7 +23,7 @@ typedef struct freeblock {
     struct freenode *nodes;
 } Freeblock;
 
-#include "mem.h"
+#include <neatogen/mem.h>
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/lib/neatogen/mosek_quad_solve.c b/lib/neatogen/mosek_quad_solve.c
index 84bc51ed9..e4c8ca9b2 100644
--- a/lib/neatogen/mosek_quad_solve.c
+++ b/lib/neatogen/mosek_quad_solve.c
@@ -26,9 +26,9 @@
 #ifdef MOSEK
 #include <stdio.h>
 #include <assert.h>
-#include "defs.h"
-#include "mosek_quad_solve.h"
-#include "quad_prog_vpsc.h"
+#include <neatogen/defs.h>
+#include <neatogen/mosek_quad_solve.h>
+#include <neatogen/quad_prog_vpsc.h>
 
 /* #define DUMP_CONSTRAINTS */
 /* #define EQUAL_WIDTH_LEVELS */
diff --git a/lib/neatogen/multispline.c b/lib/neatogen/multispline.c
index 702e473ae..df752100e 100644
--- a/lib/neatogen/multispline.c
+++ b/lib/neatogen/multispline.c
@@ -11,9 +11,9 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include <multispline.h>
-#include <delaunay.h>
-#include <neatoprocs.h>
+#include <neatogen/multispline.h>
+#include <neatogen/delaunay.h>
+#include <neatogen/neatoprocs.h>
 #include <math.h>
 
 
@@ -1262,7 +1262,7 @@ static void resetGraph(tgraph * g, int ncnt, int ecnt)
 #define PQVTYPE float
 
 #define PQ_TYPES
-#include "fPQ.h"
+#include <neatogen/fPQ.h>
 #undef PQ_TYPES
 
 typedef struct {
@@ -1275,7 +1275,7 @@ typedef struct {
 #define N_IDX(pq,n) ((PPQ*)pq)->idxs[n]
 
 #define PQ_CODE
-#include "fPQ.h"
+#include <neatogen/fPQ.h>
 #undef PQ_CODE
 
 #define N_DAD(n) dad[n]
diff --git a/lib/neatogen/neatoinit.c b/lib/neatogen/neatoinit.c
index 5e1b03f49..24720b88e 100644
--- a/lib/neatogen/neatoinit.c
+++ b/lib/neatogen/neatoinit.c
@@ -20,16 +20,16 @@
 #endif
 #include <ctype.h>
 
-#include "neato.h"
-#include "pack.h"
-#include "stress.h"
+#include <neatogen/neato.h>
+#include <pack/pack.h>
+#include <neatogen/stress.h>
 #ifdef DIGCOLA
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #endif
-#include "kkutils.h"
-#include "pointset.h"
-#include "sgd.h"
-#include "strcasecmp.h"
+#include <neatogen/kkutils.h>
+#include <common/pointset.h>
+#include <neatogen/sgd.h>
+#include <cgraph/strcasecmp.h>
 
 #ifndef HAVE_SRAND48
 #define srand48 srand
diff --git a/lib/neatogen/neatosplines.c b/lib/neatogen/neatosplines.c
index cf6716d0c..62ff5859d 100644
--- a/lib/neatogen/neatosplines.c
+++ b/lib/neatogen/neatosplines.c
@@ -14,17 +14,17 @@
 
 #include "config.h"
 
-#include "neato.h"
-#include "adjust.h"
-#include "pathplan.h"
-#include "vispath.h"
-#include "multispline.h"
+#include <neatogen/neato.h>
+#include <neatogen/adjust.h>
+#include <pathplan/pathplan.h>
+#include <pathplan/vispath.h>
+#include <neatogen/multispline.h>
 #ifndef HAVE_DRAND48
 extern double drand48(void);
 #endif
 
 #ifdef ORTHO
-#include <ortho.h>
+#include <ortho/ortho.h>
 #endif
 
 extern int in_poly(Ppoly_t argpoly, Ppoint_t q);
diff --git a/lib/neatogen/opt_arrangement.c b/lib/neatogen/opt_arrangement.c
index 54ff4c1df..2d0b274a3 100644
--- a/lib/neatogen/opt_arrangement.c
+++ b/lib/neatogen/opt_arrangement.c
@@ -11,10 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef DIGCOLA
-#include "matrix_ops.h"
-#include "conjgrad.h"
+#include <neatogen/matrix_ops.h>
+#include <neatogen/conjgrad.h>
 
 static void construct_b(vtx_data * graph, int n, double *b)
 {
diff --git a/lib/neatogen/overlap.c b/lib/neatogen/overlap.c
index a6a10c4d3..6b58e7a36 100644
--- a/lib/neatogen/overlap.c
+++ b/lib/neatogen/overlap.c
@@ -12,17 +12,17 @@
  *************************************************************************/
 
 #include "config.h"
-#include "overlap.h"
+#include <neatogen/overlap.h>
 
 #if ((defined(HAVE_GTS) || defined(HAVE_TRIANGLE)) && defined(SFDP))
 
-#include "SparseMatrix.h"
-#include "call_tri.h"
-#include "red_black_tree.h"
-#include "types.h"
+#include <sparse/SparseMatrix.h>
+#include <neatogen/call_tri.h>
+#include <rbtree/red_black_tree.h>
+#include <common/types.h>
 #include <math.h>
-#include "memory.h"
-#include "globals.h"
+#include <common/memory.h>
+#include <common/globals.h>
 #include <time.h>
 
 static void ideal_distance_avoid_overlap(int dim, SparseMatrix A, real *x, real *width, real *ideal_distance, real *tmax, real *tmin){
@@ -680,8 +680,8 @@ void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntr
 }
 
 #else
-#include "types.h"
-#include "SparseMatrix.h"
+#include <common/types.h>
+#include <sparse/SparseMatrix.h>
 void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntry, real initial_scaling,
 		    int edge_labeling_scheme, int n_constr_nodes, int *constr_nodes, SparseMatrix A_constr, int do_shrinking, int *flag)
 {
diff --git a/lib/neatogen/pca.c b/lib/neatogen/pca.c
index 4fa7eb0fc..b863a7789 100644
--- a/lib/neatogen/pca.c
+++ b/lib/neatogen/pca.c
@@ -12,9 +12,9 @@
  *************************************************************************/
 
 
-#include "matrix_ops.h"
-#include "pca.h"
-#include "closest.h"
+#include <neatogen/matrix_ops.h>
+#include <neatogen/pca.h>
+#include <neatogen/closest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/lib/neatogen/poly.c b/lib/neatogen/poly.c
index 686182675..a31965ef8 100644
--- a/lib/neatogen/poly.c
+++ b/lib/neatogen/poly.c
@@ -14,13 +14,13 @@
 /* poly.c
  */
 
-#include "neato.h"
+#include <neatogen/neato.h>
 #include <assert.h>
 #include <string.h>
 #include <math.h>
-#include "poly.h"
-#include "geom.h"
-#include "mem.h"
+#include <neatogen/poly.h>
+#include <common/geom.h>
+#include <neatogen/mem.h>
 
 #define BOX 1
 #define ISBOX(p) ((p)->kind & BOX)
diff --git a/lib/neatogen/printvis.c b/lib/neatogen/printvis.c
index 99b1fc14a..81a87cd1f 100644
--- a/lib/neatogen/printvis.c
+++ b/lib/neatogen/printvis.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 #include <stdio.h>
-#include <vis.h>
+#include <pathplan/vis.h>
 typedef Ppoint_t point;
 
 
diff --git a/lib/neatogen/quad_prog_solve.c b/lib/neatogen/quad_prog_solve.c
index f8748a921..9b444af4d 100644
--- a/lib/neatogen/quad_prog_solve.c
+++ b/lib/neatogen/quad_prog_solve.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef DIGCOLA
 #include <math.h>
 #include <stdlib.h>
@@ -19,9 +19,9 @@
 #include <stdio.h>
 #include <float.h>
 #include <assert.h>
-#include "matrix_ops.h"
-#include "kkutils.h"
-#include "quad_prog_solver.h"
+#include <neatogen/matrix_ops.h>
+#include <neatogen/kkutils.h>
+#include <neatogen/quad_prog_solver.h>
 
 #define quad_prog_tol 1e-2
 
diff --git a/lib/neatogen/quad_prog_vpsc.c b/lib/neatogen/quad_prog_vpsc.c
index ff63ec9ec..22297b0d5 100644
--- a/lib/neatogen/quad_prog_vpsc.c
+++ b/lib/neatogen/quad_prog_vpsc.c
@@ -25,7 +25,7 @@
  * Tim Dwyer, 2006
  **********************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef IPSEPCOLA
 #include <math.h>
 #include <stdlib.h>
@@ -33,11 +33,11 @@
 #include <stdio.h>
 #include <float.h>
 #include <assert.h>
-#include "matrix_ops.h"
-#include "kkutils.h"
-#include <csolve_VPSC.h>
-#include "quad_prog_vpsc.h"
-#include "quad_prog_solver.h"
+#include <neatogen/matrix_ops.h>
+#include <neatogen/kkutils.h>
+#include <vpsc/csolve_VPSC.h>
+#include <neatogen/quad_prog_vpsc.h>
+#include <neatogen/quad_prog_solver.h>
 
 /* #define CONMAJ_LOGGING 1 */
 #define quad_prog_tol 1e-4
diff --git a/lib/neatogen/randomkit.c b/lib/neatogen/randomkit.c
index 9673d91ec..0b85dab9f 100644
--- a/lib/neatogen/randomkit.c
+++ b/lib/neatogen/randomkit.c
@@ -71,7 +71,7 @@
 #include <limits.h>
 #include <math.h>
 
-#include "randomkit.h"
+#include <neatogen/randomkit.h>
 
 #ifndef RK_DEV_URANDOM
 #define RK_DEV_URANDOM "/dev/urandom"
diff --git a/lib/neatogen/sgd.c b/lib/neatogen/sgd.c
index 906ee03c8..bd7ad6132 100644
--- a/lib/neatogen/sgd.c
+++ b/lib/neatogen/sgd.c
@@ -1,8 +1,8 @@
-#include "neato.h"
-#include "sgd.h"
-#include "dijkstra.h"
-#include "randomkit.h"
-#include "neatoprocs.h"
+#include <neatogen/neato.h>
+#include <neatogen/sgd.h>
+#include <neatogen/dijkstra.h>
+#include <neatogen/randomkit.h>
+#include <neatogen/neatoprocs.h>
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/lib/neatogen/site.c b/lib/neatogen/site.c
index d3e970a45..464d98b26 100644
--- a/lib/neatogen/site.c
+++ b/lib/neatogen/site.c
@@ -11,8 +11,8 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "mem.h"
-#include "site.h"
+#include <neatogen/mem.h>
+#include <neatogen/site.h>
 #include <math.h>
 
 
diff --git a/lib/neatogen/smart_ini_x.c b/lib/neatogen/smart_ini_x.c
index 7a20a0b38..cad383b30 100644
--- a/lib/neatogen/smart_ini_x.c
+++ b/lib/neatogen/smart_ini_x.c
@@ -11,11 +11,11 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef DIGCOLA
-#include "kkutils.h"
-#include "matrix_ops.h"
-#include "conjgrad.h"
+#include <neatogen/kkutils.h>
+#include <neatogen/matrix_ops.h>
+#include <neatogen/conjgrad.h>
 
 static void
 standardize(double* orthog, int nvtxs) 
diff --git a/lib/neatogen/solve.c b/lib/neatogen/solve.c
index 6720df7c7..ba82f57d6 100644
--- a/lib/neatogen/solve.c
+++ b/lib/neatogen/solve.c
@@ -16,7 +16,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "render.h"
+#include <common/render.h>
 #define asub(i,j) a[(i)*n + (j)]
 
 
diff --git a/lib/neatogen/stress.c b/lib/neatogen/stress.c
index e8ade2dd0..f43ecb39b 100644
--- a/lib/neatogen/stress.c
+++ b/lib/neatogen/stress.c
@@ -12,15 +12,15 @@
  *************************************************************************/
 
 
-#include "neato.h"
-#include "dijkstra.h"
-#include "bfs.h"
-#include "pca.h"
-#include "matrix_ops.h"
-#include "conjgrad.h"
-#include "embed_graph.h"
-#include "kkutils.h"
-#include "stress.h"
+#include <neatogen/neato.h>
+#include <neatogen/dijkstra.h>
+#include <neatogen/bfs.h>
+#include <neatogen/pca.h>
+#include <neatogen/matrix_ops.h>
+#include <neatogen/conjgrad.h>
+#include <neatogen/embed_graph.h>
+#include <neatogen/kkutils.h>
+#include <neatogen/stress.h>
 #include <math.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/lib/neatogen/stuff.c b/lib/neatogen/stuff.c
index ba1796551..102401fc8 100644
--- a/lib/neatogen/stuff.c
+++ b/lib/neatogen/stuff.c
@@ -14,8 +14,8 @@
 
 #include "config.h"
 
-#include	"neato.h"
-#include	"stress.h"
+#include	<neatogen/neato.h>
+#include	<neatogen/stress.h>
 #include	<time.h>
 #ifndef _WIN32
 #include	<unistd.h>
diff --git a/lib/neatogen/voronoi.c b/lib/neatogen/voronoi.c
index f3b2c83bc..03e467095 100644
--- a/lib/neatogen/voronoi.c
+++ b/lib/neatogen/voronoi.c
@@ -11,12 +11,12 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "mem.h"
-#include "geometry.h"
-#include "edges.h"
-#include "hedges.h"
-#include "heap.h"
-#include "voronoi.h"
+#include <neatogen/mem.h>
+#include <neatogen/geometry.h>
+#include <neatogen/edges.h>
+#include <neatogen/hedges.h>
+#include <neatogen/heap.h>
+#include <neatogen/voronoi.h>
 
 
 void voronoi(int triangulate, Site * (*nextsite) (void))