diff --git a/.classpath b/.classpath
index 56f64db7f..ab1f0776c 100644
--- a/.classpath
+++ b/.classpath
@@ -21,6 +21,7 @@
+
diff --git a/build.xml b/build.xml
index d4730c697..43c580e4e 100644
--- a/build.xml
+++ b/build.xml
@@ -177,6 +177,9 @@ under the License.
+
+
@@ -276,6 +279,7 @@ under the License.
+
@@ -319,6 +323,7 @@ under the License.
+
@@ -558,6 +563,7 @@ under the License.
+
@@ -567,6 +573,10 @@ under the License.
+
+
+
+
diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom
index 28195b551..5850def21 100644
--- a/maven/poi-ooxml.pom
+++ b/maven/poi-ooxml.pom
@@ -69,5 +69,10 @@
poi-ooxml-schemas
@VERSION@
+
+ com.github.virtuald
+ curvesapi
+ 1.02
+
diff --git a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java b/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java
index f1037a4fb..a977cb627 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java
+++ b/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java
@@ -20,11 +20,15 @@ package org.apache.poi.xdgf.geom;
import java.awt.geom.Point2D;
import java.util.ArrayList;
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
import org.apache.poi.xdgf.usermodel.XDGFShape;
import org.apache.poi.xdgf.usermodel.section.geometry.SplineKnot;
import org.apache.poi.xdgf.usermodel.section.geometry.SplineStart;
+import com.graphbuilder.curve.ControlPath;
+import com.graphbuilder.curve.ShapeMultiPath;
+import com.graphbuilder.curve.ValueVector;
+import com.graphbuilder.geom.PointFactory;
+
public class SplineCollector {
SplineStart _start;
diff --git a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java b/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
index 775786008..a478ae4a9 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
+++ b/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
@@ -17,7 +17,12 @@
package org.apache.poi.xdgf.geom;
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
+import com.graphbuilder.curve.ControlPath;
+import com.graphbuilder.curve.GroupIterator;
+import com.graphbuilder.curve.NURBSpline;
+import com.graphbuilder.curve.ShapeMultiPath;
+import com.graphbuilder.curve.ValueVector;
+
public class SplineRenderer {
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java b/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
index c235f4843..353d694f9 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
+++ b/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
@@ -20,11 +20,14 @@ package org.apache.poi.xdgf.usermodel.section.geometry;
import java.awt.geom.Point2D;
import org.apache.poi.POIXMLException;
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
import org.apache.poi.xdgf.geom.SplineRenderer;
import org.apache.poi.xdgf.usermodel.XDGFCell;
import org.apache.poi.xdgf.usermodel.XDGFShape;
+import com.graphbuilder.curve.ControlPath;
+import com.graphbuilder.curve.ShapeMultiPath;
+import com.graphbuilder.curve.ValueVector;
+import com.graphbuilder.geom.PointFactory;
import com.microsoft.schemas.office.visio.x2012.main.CellType;
import com.microsoft.schemas.office.visio.x2012.main.RowType;