diff --git a/interface.go b/interface.go
index 5ec750abe1..1f20a8be73 100644
--- a/interface.go
+++ b/interface.go
@@ -4,7 +4,6 @@ import (
 	"io"
 	"time"
 
-	volumetypes "github.com/docker/docker/api/server/types/volume"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/events"
@@ -12,6 +11,7 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/api/types/swarm"
+	volumetypes "github.com/docker/docker/api/types/volume"
 	"golang.org/x/net/context"
 )
 
diff --git a/volume_create.go b/volume_create.go
index b18e5fe600..9620c87cbf 100644
--- a/volume_create.go
+++ b/volume_create.go
@@ -3,8 +3,8 @@ package client
 import (
 	"encoding/json"
 
-	volumetypes "github.com/docker/docker/api/server/types/volume"
 	"github.com/docker/docker/api/types"
+	volumetypes "github.com/docker/docker/api/types/volume"
 	"golang.org/x/net/context"
 )
 
diff --git a/volume_create_test.go b/volume_create_test.go
index d5d3791685..9f1b2540b5 100644
--- a/volume_create_test.go
+++ b/volume_create_test.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	volumetypes "github.com/docker/docker/api/server/types/volume"
 	"github.com/docker/docker/api/types"
+	volumetypes "github.com/docker/docker/api/types/volume"
 	"golang.org/x/net/context"
 )
 
diff --git a/volume_list.go b/volume_list.go
index 9923ecb82c..32247ce115 100644
--- a/volume_list.go
+++ b/volume_list.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"net/url"
 
-	volumetypes "github.com/docker/docker/api/server/types/volume"
 	"github.com/docker/docker/api/types/filters"
+	volumetypes "github.com/docker/docker/api/types/volume"
 	"golang.org/x/net/context"
 )
 
diff --git a/volume_list_test.go b/volume_list_test.go
index ffdd904b58..f29639be23 100644
--- a/volume_list_test.go
+++ b/volume_list_test.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"testing"
 
-	volumetypes "github.com/docker/docker/api/server/types/volume"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	volumetypes "github.com/docker/docker/api/types/volume"
 	"golang.org/x/net/context"
 )