Index: applications/editors/josm/plugins/livegps/src/livegps/AppendableGpxTrackSegment.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/AppendableGpxTrackSegment.java	(revision 34619)
+++ applications/editors/josm/plugins/livegps/src/livegps/AppendableGpxTrackSegment.java	(revision 35221)
@@ -5,6 +5,7 @@
 
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.gpx.WithAttributes;
 import org.openstreetmap.josm.tools.CopyList;
 
@@ -13,5 +14,5 @@
  *
  */
-public class AppendableGpxTrackSegment implements GpxTrackSegment {
+public class AppendableGpxTrackSegment extends WithAttributes implements IGpxTrackSegment {
 
     private WayPoint[] wayPoints = new WayPoint[16];
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java	(revision 34619)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java	(revision 35221)
@@ -15,5 +15,5 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -51,5 +51,5 @@
         attr.put("desc", "josm live gps");
 
-        GpxTrack trackBeingWritten = new SingleSegmentGpxTrack(trackSegment, attr);
+        IGpxTrack trackBeingWritten = new SingleSegmentGpxTrack(trackSegment, attr);
         data.tracks.add(trackBeingWritten);
 
Index: applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java	(revision 34619)
+++ applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java	(revision 35221)
@@ -7,13 +7,13 @@
 
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WithAttributes;
 
-public class SingleSegmentGpxTrack extends WithAttributes implements GpxTrack {
+public class SingleSegmentGpxTrack extends WithAttributes implements IGpxTrack {
 
-    private final GpxTrackSegment trackSegment;
+    private final IGpxTrackSegment trackSegment;
 
-    public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
+    public SingleSegmentGpxTrack(IGpxTrackSegment trackSegment, Map<String, Object> attributes) {
         this.attr = Collections.unmodifiableMap(attributes);
         this.trackSegment = trackSegment;
@@ -31,5 +31,5 @@
 
     @Override
-    public Collection<GpxTrackSegment> getSegments() {
+    public Collection<IGpxTrackSegment> getSegments() {
         return Collections.singleton(trackSegment);
     }