diff --git a/api/client/attach.go b/api/client/attach.go
index 1cb097dfb5096..6bfe1be187abd 100644
--- a/api/client/attach.go
+++ b/api/client/attach.go
@@ -5,10 +5,10 @@ import (
 	"io"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/signal"
+	"github.com/docker/engine-api/types"
 )
 
 // CmdAttach attaches to a running container.
diff --git a/api/client/build.go b/api/client/build.go
index 0706b2f0c6dfd..ee470bcd05d63 100644
--- a/api/client/build.go
+++ b/api/client/build.go
@@ -15,8 +15,6 @@ import (
 	"strings"
 
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/builder/dockerignore"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/opts"
@@ -31,6 +29,8 @@ import (
 	"github.com/docker/docker/pkg/urlutil"
 	"github.com/docker/docker/reference"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 	"github.com/docker/go-units"
 )
 
diff --git a/api/client/cli.go b/api/client/cli.go
index 4f4362d90b99c..5d54ccfaf9636 100644
--- a/api/client/cli.go
+++ b/api/client/cli.go
@@ -9,12 +9,12 @@ import (
 	"runtime"
 
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/client/lib"
 	"github.com/docker/docker/cli"
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/term"
+	"github.com/docker/engine-api/client"
 	"github.com/docker/go-connections/tlsconfig"
 )
 
@@ -120,7 +120,7 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF
 			return err
 		}
 
-		client, err := lib.NewClient(host, verStr, clientTransport, customHeaders)
+		client, err := client.NewClient(host, verStr, clientTransport, customHeaders)
 		if err != nil {
 			return err
 		}
diff --git a/api/client/client.go b/api/client/client.go
index d820dad12e45c..4bea72c6c7e52 100644
--- a/api/client/client.go
+++ b/api/client/client.go
@@ -7,11 +7,11 @@ package client
 import (
 	"io"
 
-	"github.com/docker/docker/api/client/lib"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/registry"
+	"github.com/docker/engine-api/client"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
+	"github.com/docker/engine-api/types/filters"
+	"github.com/docker/engine-api/types/registry"
 )
 
 // apiClient is an interface that clients that talk with a docker server must implement.
@@ -55,10 +55,10 @@ type apiClient interface {
 	ImageInspectWithRaw(imageID string, getSize bool) (types.ImageInspect, []byte, error)
 	ImageList(options types.ImageListOptions) ([]types.Image, error)
 	ImageLoad(input io.Reader) (types.ImageLoadResponse, error)
-	ImagePull(options types.ImagePullOptions, privilegeFunc lib.RequestPrivilegeFunc) (io.ReadCloser, error)
-	ImagePush(options types.ImagePushOptions, privilegeFunc lib.RequestPrivilegeFunc) (io.ReadCloser, error)
+	ImagePull(options types.ImagePullOptions, privilegeFunc client.RequestPrivilegeFunc) (io.ReadCloser, error)
+	ImagePush(options types.ImagePushOptions, privilegeFunc client.RequestPrivilegeFunc) (io.ReadCloser, error)
 	ImageRemove(options types.ImageRemoveOptions) ([]types.ImageDelete, error)
-	ImageSearch(options types.ImageSearchOptions, privilegeFunc lib.RequestPrivilegeFunc) ([]registry.SearchResult, error)
+	ImageSearch(options types.ImageSearchOptions, privilegeFunc client.RequestPrivilegeFunc) ([]registry.SearchResult, error)
 	ImageSave(imageIDs []string) (io.ReadCloser, error)
 	ImageTag(options types.ImageTagOptions) error
 	Info() (types.Info, error)
diff --git a/api/client/commit.go b/api/client/commit.go
index 48678d4d8f8d0..4c0d5c28d8cee 100644
--- a/api/client/commit.go
+++ b/api/client/commit.go
@@ -5,12 +5,12 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/opts"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 )
 
 // CmdCommit creates a new image from a container's changes.
diff --git a/api/client/cp.go b/api/client/cp.go
index 0c3f19ffc64fa..43573d906bcda 100644
--- a/api/client/cp.go
+++ b/api/client/cp.go
@@ -7,11 +7,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/pkg/archive"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/system"
+	"github.com/docker/engine-api/types"
 )
 
 type copyDirection int
diff --git a/api/client/create.go b/api/client/create.go
index 2569ae755a05e..fce4062f810c0 100644
--- a/api/client/create.go
+++ b/api/client/create.go
@@ -5,14 +5,14 @@ import (
 	"io"
 	"os"
 
-	"github.com/docker/docker/api/client/lib"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
+	"github.com/docker/engine-api/client"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 )
 
 func (cli *DockerCli) pullImage(image string) error {
@@ -110,7 +110,7 @@ func (cli *DockerCli) createContainer(config *container.Config, hostConfig *cont
 	response, err := cli.client.ContainerCreate(config, hostConfig, name)
 	//if image not found try to pull it
 	if err != nil {
-		if lib.IsErrImageNotFound(err) {
+		if client.IsErrImageNotFound(err) {
 			fmt.Fprintf(cli.err, "Unable to find image '%s' locally\n", ref.String())
 
 			// we don't want to write to stdout anything apart from container.ID
diff --git a/api/client/events.go b/api/client/events.go
index 4ceaf43f8406d..c2a6ab3bb1cdd 100644
--- a/api/client/events.go
+++ b/api/client/events.go
@@ -7,13 +7,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	eventtypes "github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/jsonlog"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/engine-api/types"
+	eventtypes "github.com/docker/engine-api/types/events"
+	"github.com/docker/engine-api/types/filters"
 )
 
 // CmdEvents prints a live stream of real time events from the server.
diff --git a/api/client/exec.go b/api/client/exec.go
index ac2e65868d757..0ce9e81fe37ed 100644
--- a/api/client/exec.go
+++ b/api/client/exec.go
@@ -5,10 +5,10 @@ import (
 	"io"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/promise"
+	"github.com/docker/engine-api/types"
 )
 
 // CmdExec runs a command in a running container.
diff --git a/api/client/exec_test.go b/api/client/exec_test.go
index 7fd4f7adedf29..1680fa6e79dfa 100644
--- a/api/client/exec_test.go
+++ b/api/client/exec_test.go
@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/docker/docker/api/types"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/engine-api/types"
 )
 
 type arguments struct {
diff --git a/api/client/formatter/custom.go b/api/client/formatter/custom.go
index 97cdbc1896c4c..8a680705ca5db 100644
--- a/api/client/formatter/custom.go
+++ b/api/client/formatter/custom.go
@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/stringutils"
+	"github.com/docker/engine-api/types"
 	"github.com/docker/go-units"
 )
 
diff --git a/api/client/formatter/custom_test.go b/api/client/formatter/custom_test.go
index fee3ba889f46e..608622564a847 100644
--- a/api/client/formatter/custom_test.go
+++ b/api/client/formatter/custom_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
+	"github.com/docker/engine-api/types"
 )
 
 func TestContainerPsContext(t *testing.T) {
diff --git a/api/client/formatter/formatter.go b/api/client/formatter/formatter.go
index 2e19e9396a6a9..749148ac82a14 100644
--- a/api/client/formatter/formatter.go
+++ b/api/client/formatter/formatter.go
@@ -8,8 +8,8 @@ import (
 	"text/tabwriter"
 	"text/template"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types"
 )
 
 const (
diff --git a/api/client/formatter/formatter_test.go b/api/client/formatter/formatter_test.go
index 6d7185311ce7e..223cab970a6a2 100644
--- a/api/client/formatter/formatter_test.go
+++ b/api/client/formatter/formatter_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 func TestContainerContextWrite(t *testing.T) {
diff --git a/api/client/hijack.go b/api/client/hijack.go
index 72f5ed43debf4..ea4b5e3875f2e 100644
--- a/api/client/hijack.go
+++ b/api/client/hijack.go
@@ -5,9 +5,9 @@ import (
 	"os"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/docker/docker/pkg/term"
+	"github.com/docker/engine-api/types"
 )
 
 func (cli *DockerCli) holdHijackedConnection(setRawTerminal bool, inputStream io.ReadCloser, outputStream, errorStream io.Writer, resp types.HijackedResponse) error {
diff --git a/api/client/images.go b/api/client/images.go
index ef19bd32f34d6..2b0b4045d2f18 100644
--- a/api/client/images.go
+++ b/api/client/images.go
@@ -2,11 +2,11 @@ package client
 
 import (
 	"github.com/docker/docker/api/client/formatter"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/opts"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
 )
 
 // CmdImages lists the images in a specified repository, or all top-level images if no repository is specified.
diff --git a/api/client/import.go b/api/client/import.go
index 692566d72b63b..ece821aef64b3 100644
--- a/api/client/import.go
+++ b/api/client/import.go
@@ -5,13 +5,13 @@ import (
 	"io"
 	"os"
 
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/jsonmessage"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/urlutil"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types"
 )
 
 // CmdImport creates an empty filesystem image, imports the contents of the tarball into the image, and optionally tags the image.
diff --git a/api/client/inspect.go b/api/client/inspect.go
index 375129bdaa443..5401d3bc3de98 100644
--- a/api/client/inspect.go
+++ b/api/client/inspect.go
@@ -6,9 +6,9 @@ import (
 	"text/template"
 
 	"github.com/docker/docker/api/client/inspect"
-	"github.com/docker/docker/api/client/lib"
 	Cli "github.com/docker/docker/cli"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/engine-api/client"
 )
 
 var funcMap = template.FuncMap{
@@ -64,10 +64,10 @@ func (cli *DockerCli) inspectAll(getSize bool) inspectSearcher {
 		c, rawContainer, err := cli.client.ContainerInspectWithRaw(ref, getSize)
 		if err != nil {
 			// Search for image with that id if a container doesn't exist.
-			if lib.IsErrContainerNotFound(err) {
+			if client.IsErrContainerNotFound(err) {
 				i, rawImage, err := cli.client.ImageInspectWithRaw(ref, getSize)
 				if err != nil {
-					if lib.IsErrImageNotFound(err) {
+					if client.IsErrImageNotFound(err) {
 						return nil, nil, fmt.Errorf("Error: No such image or container: %s", ref)
 					}
 					return nil, nil, err
diff --git a/api/client/lib/container_attach.go b/api/client/lib/container_attach.go
index aac4d653042e5..4074bc99a8a33 100644
--- a/api/client/lib/container_attach.go
+++ b/api/client/lib/container_attach.go
@@ -3,7 +3,7 @@ package lib
 import (
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerAttach attaches a connection to a container in the server.
diff --git a/api/client/lib/container_commit.go b/api/client/lib/container_commit.go
index 45cf166250449..9908a19273d83 100644
--- a/api/client/lib/container_commit.go
+++ b/api/client/lib/container_commit.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerCommit applies changes into a container and creates a new tagged image.
diff --git a/api/client/lib/container_create.go b/api/client/lib/container_create.go
index e563d7b5a2d83..50fa927dc7cab 100644
--- a/api/client/lib/container_create.go
+++ b/api/client/lib/container_create.go
@@ -5,8 +5,8 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 )
 
 type configWrapper struct {
diff --git a/api/client/lib/container_inspect.go b/api/client/lib/container_inspect.go
index 41e413132e0a8..49b8893982a65 100644
--- a/api/client/lib/container_inspect.go
+++ b/api/client/lib/container_inspect.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerInspect returns the container information.
diff --git a/api/client/lib/container_list.go b/api/client/lib/container_list.go
index 6ffe41585658a..c05b1d5d665ed 100644
--- a/api/client/lib/container_list.go
+++ b/api/client/lib/container_list.go
@@ -5,8 +5,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
 )
 
 // ContainerList returns the list of containers in the docker host.
diff --git a/api/client/lib/container_remove.go b/api/client/lib/container_remove.go
index aff5012b36fa1..76fe9bd40d735 100644
--- a/api/client/lib/container_remove.go
+++ b/api/client/lib/container_remove.go
@@ -3,7 +3,7 @@ package lib
 import (
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerRemove kills and removes a container from the docker host.
diff --git a/api/client/lib/container_top.go b/api/client/lib/container_top.go
index abee1ed417ef1..98860c8aa726d 100644
--- a/api/client/lib/container_top.go
+++ b/api/client/lib/container_top.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerTop shows process information from within a container.
diff --git a/api/client/lib/container_update.go b/api/client/lib/container_update.go
index 387a6c475dce9..6976e3d9f1dd1 100644
--- a/api/client/lib/container_update.go
+++ b/api/client/lib/container_update.go
@@ -1,7 +1,7 @@
 package lib
 
 import (
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types/container"
 )
 
 // ContainerUpdate updates resources of a container
diff --git a/api/client/lib/copy.go b/api/client/lib/copy.go
index e26a7f79b0080..b18c89334e6d9 100644
--- a/api/client/lib/copy.go
+++ b/api/client/lib/copy.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerStatPath returns Stat information about a path inside the container filesystem.
diff --git a/api/client/lib/diff.go b/api/client/lib/diff.go
index 15954c5ed794e..eaa7db112da0c 100644
--- a/api/client/lib/diff.go
+++ b/api/client/lib/diff.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerDiff shows differences in a container filesystem since it was started.
diff --git a/api/client/lib/events.go b/api/client/lib/events.go
index 502e765208e2d..9d4606829b27c 100644
--- a/api/client/lib/events.go
+++ b/api/client/lib/events.go
@@ -5,9 +5,9 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	timetypes "github.com/docker/docker/api/types/time"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
+	timetypes "github.com/docker/engine-api/types/time"
 )
 
 // Events returns a stream of events in the daemon in a ReadCloser.
diff --git a/api/client/lib/exec.go b/api/client/lib/exec.go
index 8bcabb165707a..229db2711b4ec 100644
--- a/api/client/lib/exec.go
+++ b/api/client/lib/exec.go
@@ -3,7 +3,7 @@ package lib
 import (
 	"encoding/json"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerExecCreate creates a new exec configuration to run an exec process.
diff --git a/api/client/lib/hijack.go b/api/client/lib/hijack.go
index 6c76f0a88e077..6ee8d160e4e13 100644
--- a/api/client/lib/hijack.go
+++ b/api/client/lib/hijack.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // tlsClientCon holds tls information and a dialed connection.
diff --git a/api/client/lib/history.go b/api/client/lib/history.go
index e729f70eff761..4fb4e5d8df78d 100644
--- a/api/client/lib/history.go
+++ b/api/client/lib/history.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ImageHistory returns the changes in an image in history format.
diff --git a/api/client/lib/image_build.go b/api/client/lib/image_build.go
index da4d6efc6816f..c6d874047768d 100644
--- a/api/client/lib/image_build.go
+++ b/api/client/lib/image_build.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 )
 
 var headerRegexp = regexp.MustCompile(`\ADocker/.+\s\((.+)\)\z`)
diff --git a/api/client/lib/image_create.go b/api/client/lib/image_create.go
index 75d4b75e4a429..f4070d62c043b 100644
--- a/api/client/lib/image_create.go
+++ b/api/client/lib/image_create.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ImageCreate creates a new image based in the parent options.
diff --git a/api/client/lib/image_import.go b/api/client/lib/image_import.go
index 873010f3e5bfd..fbd487bf9a380 100644
--- a/api/client/lib/image_import.go
+++ b/api/client/lib/image_import.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ImageImport creates a new image based in the source options.
diff --git a/api/client/lib/image_inspect.go b/api/client/lib/image_inspect.go
index f4089cba0b80b..59f991f689086 100644
--- a/api/client/lib/image_inspect.go
+++ b/api/client/lib/image_inspect.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ImageInspectWithRaw returns the image information and it's raw representation.
diff --git a/api/client/lib/image_list.go b/api/client/lib/image_list.go
index d0b18ea911d7e..61c62bfe57a45 100644
--- a/api/client/lib/image_list.go
+++ b/api/client/lib/image_list.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
 )
 
 // ImageList returns a list of images in the docker host.
diff --git a/api/client/lib/image_load.go b/api/client/lib/image_load.go
index c713262c79417..1fcb904523cbb 100644
--- a/api/client/lib/image_load.go
+++ b/api/client/lib/image_load.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ImageLoad loads an image in the docker host from the client host.
diff --git a/api/client/lib/image_pull.go b/api/client/lib/image_pull.go
index ef5f1ce6e6381..98fd6e86f2d30 100644
--- a/api/client/lib/image_pull.go
+++ b/api/client/lib/image_pull.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ImagePull request the docker host to pull an image from a remote registry.
diff --git a/api/client/lib/image_push.go b/api/client/lib/image_push.go
index 14c369afac927..620ea7d5109c5 100644
--- a/api/client/lib/image_push.go
+++ b/api/client/lib/image_push.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ImagePush request the docker host to push an image to a remote registry.
diff --git a/api/client/lib/image_remove.go b/api/client/lib/image_remove.go
index fb221da6bdedb..d0ec6040dc7ce 100644
--- a/api/client/lib/image_remove.go
+++ b/api/client/lib/image_remove.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ImageRemove removes an image from the docker host.
diff --git a/api/client/lib/image_search.go b/api/client/lib/image_search.go
index 4e6bc7da139ba..3f9f24e1e7ee0 100644
--- a/api/client/lib/image_search.go
+++ b/api/client/lib/image_search.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/registry"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/registry"
 )
 
 // ImageSearch makes the docker host to search by a term in a remote registry.
diff --git a/api/client/lib/image_tag.go b/api/client/lib/image_tag.go
index d83e33fe23556..a0a2230fb2429 100644
--- a/api/client/lib/image_tag.go
+++ b/api/client/lib/image_tag.go
@@ -3,7 +3,7 @@ package lib
 import (
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ImageTag tags an image in the docker host
diff --git a/api/client/lib/info.go b/api/client/lib/info.go
index 04d854a290ba8..e1fa4229eaab2 100644
--- a/api/client/lib/info.go
+++ b/api/client/lib/info.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // Info returns information about the docker server.
diff --git a/api/client/lib/login.go b/api/client/lib/login.go
index c896d67ef2baf..426533f0ef0e2 100644
--- a/api/client/lib/login.go
+++ b/api/client/lib/login.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // RegistryLogin authenticates the docker server with a given docker registry.
diff --git a/api/client/lib/logs.go b/api/client/lib/logs.go
index 119f41306d469..f3fe1770ef38f 100644
--- a/api/client/lib/logs.go
+++ b/api/client/lib/logs.go
@@ -5,8 +5,8 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	timetypes "github.com/docker/docker/api/types/time"
+	"github.com/docker/engine-api/types"
+	timetypes "github.com/docker/engine-api/types/time"
 )
 
 // ContainerLogs returns the logs generated by a container in an io.ReadCloser.
diff --git a/api/client/lib/network.go b/api/client/lib/network.go
index e38d9e8c8b83f..ba80ca39c41f8 100644
--- a/api/client/lib/network.go
+++ b/api/client/lib/network.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
 )
 
 // NetworkCreate creates a new network in the docker host.
diff --git a/api/client/lib/resize.go b/api/client/lib/resize.go
index dffd81d5443c3..4040368fbcc96 100644
--- a/api/client/lib/resize.go
+++ b/api/client/lib/resize.go
@@ -4,7 +4,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerResize changes the size of the tty for a container.
diff --git a/api/client/lib/version.go b/api/client/lib/version.go
index 4101bfee0bc29..2b03ac4ea70aa 100644
--- a/api/client/lib/version.go
+++ b/api/client/lib/version.go
@@ -3,7 +3,7 @@ package lib
 import (
 	"encoding/json"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ServerVersion returns information of the docker client and server host.
diff --git a/api/client/lib/volume.go b/api/client/lib/volume.go
index fdcd1cf529191..f41f75bf09079 100644
--- a/api/client/lib/volume.go
+++ b/api/client/lib/volume.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
 )
 
 // VolumeList returns the volumes configured in the docker host.
diff --git a/api/client/lib/wait.go b/api/client/lib/wait.go
index 70993d84aa0f8..e490e09965236 100644
--- a/api/client/lib/wait.go
+++ b/api/client/lib/wait.go
@@ -3,7 +3,7 @@ package lib
 import (
 	"encoding/json"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerWait pauses execution util a container is exits.
diff --git a/api/client/login.go b/api/client/login.go
index 3b7a54717539c..a396450de17ee 100644
--- a/api/client/login.go
+++ b/api/client/login.go
@@ -8,12 +8,12 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/docker/docker/api/client/lib"
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/term"
 	"github.com/docker/docker/registry"
+	"github.com/docker/engine-api/client"
+	"github.com/docker/engine-api/types"
 )
 
 // CmdLogin logs in or registers a user to a Docker registry service.
@@ -122,7 +122,7 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
 	auth := cli.configFile.AuthConfigs[serverAddress]
 	response, err := cli.client.RegistryLogin(auth)
 	if err != nil {
-		if lib.IsErrUnauthorized(err) {
+		if client.IsErrUnauthorized(err) {
 			delete(cli.configFile.AuthConfigs, serverAddress)
 			if err2 := cli.configFile.Save(); err2 != nil {
 				fmt.Fprintf(cli.out, "WARNING: could not save config file: %v\n", err2)
diff --git a/api/client/logs.go b/api/client/logs.go
index 77c754f4da4c5..92b75e0505e91 100644
--- a/api/client/logs.go
+++ b/api/client/logs.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/stdcopy"
+	"github.com/docker/engine-api/types"
 )
 
 var validDrivers = map[string]bool{
diff --git a/api/client/network.go b/api/client/network.go
index 8c769d56db114..31cd4dbfd3a74 100644
--- a/api/client/network.go
+++ b/api/client/network.go
@@ -6,13 +6,13 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/network"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/opts"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/stringid"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
+	"github.com/docker/engine-api/types/network"
 )
 
 // CmdNetwork is the parent subcommand for all network commands
diff --git a/api/client/ps.go b/api/client/ps.go
index 3f02fa1d60f17..c0589738d674e 100644
--- a/api/client/ps.go
+++ b/api/client/ps.go
@@ -2,11 +2,11 @@ package client
 
 import (
 	"github.com/docker/docker/api/client/formatter"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/opts"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
 )
 
 // CmdPs outputs a list of Docker containers.
diff --git a/api/client/pull.go b/api/client/pull.go
index 361c341d060a8..5566d7976f52a 100644
--- a/api/client/pull.go
+++ b/api/client/pull.go
@@ -4,13 +4,13 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/docker/docker/api/client/lib"
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/pkg/jsonmessage"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
+	"github.com/docker/engine-api/client"
+	"github.com/docker/engine-api/types"
 )
 
 // CmdPull pulls an image or a repository from the registry.
@@ -65,7 +65,7 @@ func (cli *DockerCli) CmdPull(args ...string) error {
 	return cli.imagePullPrivileged(authConfig, distributionRef.String(), "", requestPrivilege)
 }
 
-func (cli *DockerCli) imagePullPrivileged(authConfig types.AuthConfig, imageID, tag string, requestPrivilege lib.RequestPrivilegeFunc) error {
+func (cli *DockerCli) imagePullPrivileged(authConfig types.AuthConfig, imageID, tag string, requestPrivilege client.RequestPrivilegeFunc) error {
 
 	encodedAuth, err := encodeAuthToBase64(authConfig)
 	if err != nil {
diff --git a/api/client/push.go b/api/client/push.go
index cc78c3c5b3b30..bbfbaf5feaef3 100644
--- a/api/client/push.go
+++ b/api/client/push.go
@@ -4,13 +4,13 @@ import (
 	"errors"
 	"io"
 
-	"github.com/docker/docker/api/client/lib"
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/pkg/jsonmessage"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
+	"github.com/docker/engine-api/client"
+	"github.com/docker/engine-api/types"
 )
 
 // CmdPush pushes an image or repository to the registry.
@@ -52,7 +52,7 @@ func (cli *DockerCli) CmdPush(args ...string) error {
 	return cli.imagePushPrivileged(authConfig, ref.Name(), tag, cli.out, requestPrivilege)
 }
 
-func (cli *DockerCli) imagePushPrivileged(authConfig types.AuthConfig, imageID, tag string, outputStream io.Writer, requestPrivilege lib.RequestPrivilegeFunc) error {
+func (cli *DockerCli) imagePushPrivileged(authConfig types.AuthConfig, imageID, tag string, outputStream io.Writer, requestPrivilege client.RequestPrivilegeFunc) error {
 	encodedAuth, err := encodeAuthToBase64(authConfig)
 	if err != nil {
 		return err
diff --git a/api/client/rm.go b/api/client/rm.go
index b26cb53d02513..39d22f669c0f9 100644
--- a/api/client/rm.go
+++ b/api/client/rm.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/engine-api/types"
 )
 
 // CmdRm removes one or more containers.
diff --git a/api/client/rmi.go b/api/client/rmi.go
index 9569370ea259f..c5593d6d047bc 100644
--- a/api/client/rmi.go
+++ b/api/client/rmi.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/engine-api/types"
 )
 
 // CmdRmi removes all images with the specified name(s).
diff --git a/api/client/run.go b/api/client/run.go
index 0a7f5265ca7ee..3eea9dc6678ac 100644
--- a/api/client/run.go
+++ b/api/client/run.go
@@ -8,13 +8,13 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/docker/docker/pkg/signal"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
+	"github.com/docker/engine-api/types"
 	"github.com/docker/libnetwork/resolvconf/dns"
 )
 
diff --git a/api/client/search.go b/api/client/search.go
index d627ef653d08e..64bbb67ea7c33 100644
--- a/api/client/search.go
+++ b/api/client/search.go
@@ -7,12 +7,12 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
 	Cli "github.com/docker/docker/cli"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/stringutils"
 	"github.com/docker/docker/registry"
+	"github.com/docker/engine-api/types"
+	registrytypes "github.com/docker/engine-api/types/registry"
 )
 
 // CmdSearch searches the Docker Hub for images.
diff --git a/api/client/start.go b/api/client/start.go
index fcfa3f366d4f2..3a2bc12636c75 100644
--- a/api/client/start.go
+++ b/api/client/start.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/docker/docker/pkg/signal"
+	"github.com/docker/engine-api/types"
 )
 
 func (cli *DockerCli) forwardAllSignals(cid string) chan os.Signal {
diff --git a/api/client/stats.go b/api/client/stats.go
index 968d17eab4413..46f4c04b9f9ed 100644
--- a/api/client/stats.go
+++ b/api/client/stats.go
@@ -10,10 +10,10 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
 	Cli "github.com/docker/docker/cli"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/events"
+	"github.com/docker/engine-api/types/filters"
 	"github.com/docker/go-units"
 )
 
diff --git a/api/client/stats_unit_test.go b/api/client/stats_unit_test.go
index 301e0a6782207..ce1c3a1741eb5 100644
--- a/api/client/stats_unit_test.go
+++ b/api/client/stats_unit_test.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 func TestDisplay(t *testing.T) {
diff --git a/api/client/tag.go b/api/client/tag.go
index a1492666d0207..5a824714bd614 100644
--- a/api/client/tag.go
+++ b/api/client/tag.go
@@ -3,10 +3,10 @@ package client
 import (
 	"errors"
 
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types"
 )
 
 // CmdTag tags an image into a repository.
diff --git a/api/client/trust.go b/api/client/trust.go
index cc93ebae00a08..31f47e468c054 100644
--- a/api/client/trust.go
+++ b/api/client/trust.go
@@ -21,15 +21,15 @@ import (
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/registry/client/auth"
 	"github.com/docker/distribution/registry/client/transport"
-	"github.com/docker/docker/api/client/lib"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/pkg/ansiescape"
 	"github.com/docker/docker/pkg/ioutils"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
+	apiclient "github.com/docker/engine-api/client"
+	"github.com/docker/engine-api/types"
+	registrytypes "github.com/docker/engine-api/types/registry"
 	"github.com/docker/go-connections/tlsconfig"
 	"github.com/docker/notary/client"
 	"github.com/docker/notary/passphrase"
@@ -280,7 +280,7 @@ func notaryError(err error) error {
 	return err
 }
 
-func (cli *DockerCli) trustedPull(repoInfo *registry.RepositoryInfo, ref registry.Reference, authConfig types.AuthConfig, requestPrivilege lib.RequestPrivilegeFunc) error {
+func (cli *DockerCli) trustedPull(repoInfo *registry.RepositoryInfo, ref registry.Reference, authConfig types.AuthConfig, requestPrivilege apiclient.RequestPrivilegeFunc) error {
 	var refs []target
 
 	notaryRepo, err := cli.getNotaryRepository(repoInfo, authConfig)
@@ -383,7 +383,7 @@ func targetStream(in io.Writer) (io.WriteCloser, <-chan []target) {
 	return ioutils.NewWriteCloserWrapper(out, w.Close), targetChan
 }
 
-func (cli *DockerCli) trustedPush(repoInfo *registry.RepositoryInfo, tag string, authConfig types.AuthConfig, requestPrivilege lib.RequestPrivilegeFunc) error {
+func (cli *DockerCli) trustedPush(repoInfo *registry.RepositoryInfo, tag string, authConfig types.AuthConfig, requestPrivilege apiclient.RequestPrivilegeFunc) error {
 	streamOut, targetChan := targetStream(cli.out)
 
 	reqError := cli.imagePushPrivileged(authConfig, repoInfo.Name(), tag, streamOut, requestPrivilege)
diff --git a/api/client/trust_test.go b/api/client/trust_test.go
index 86f9e61e4dabc..ec95bd9d35dc6 100644
--- a/api/client/trust_test.go
+++ b/api/client/trust_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/registry"
+	registrytypes "github.com/docker/engine-api/types/registry"
 )
 
 func unsetENV() {
diff --git a/api/client/update.go b/api/client/update.go
index 3f71171264e16..d1e1fd3254a6c 100644
--- a/api/client/update.go
+++ b/api/client/update.go
@@ -3,9 +3,9 @@ package client
 import (
 	"fmt"
 
-	"github.com/docker/docker/api/types/container"
 	Cli "github.com/docker/docker/cli"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/engine-api/types/container"
 	"github.com/docker/go-units"
 )
 
diff --git a/api/client/utils.go b/api/client/utils.go
index af587288662fd..687add5bc2141 100644
--- a/api/client/utils.go
+++ b/api/client/utils.go
@@ -10,12 +10,12 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/client/lib"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/docker/pkg/term"
 	"github.com/docker/docker/registry"
+	"github.com/docker/engine-api/client"
+	"github.com/docker/engine-api/types"
+	registrytypes "github.com/docker/engine-api/types/registry"
 )
 
 // encodeAuthToBase64 serializes the auth configuration as JSON base64 payload
@@ -32,7 +32,7 @@ func (cli *DockerCli) encodeRegistryAuth(index *registrytypes.IndexInfo) (string
 	return encodeAuthToBase64(authConfig)
 }
 
-func (cli *DockerCli) registryAuthenticationPrivilegedFunc(index *registrytypes.IndexInfo, cmdName string) lib.RequestPrivilegeFunc {
+func (cli *DockerCli) registryAuthenticationPrivilegedFunc(index *registrytypes.IndexInfo, cmdName string) client.RequestPrivilegeFunc {
 	return func() (string, error) {
 		fmt.Fprintf(cli.out, "\nPlease login prior to %s:\n", cmdName)
 		if err := cli.CmdLogin(registry.GetAuthConfigKey(index)); err != nil {
@@ -72,7 +72,7 @@ func getExitCode(cli *DockerCli, containerID string) (bool, int, error) {
 	c, err := cli.client.ContainerInspect(containerID)
 	if err != nil {
 		// If we can't connect, then the daemon probably died.
-		if err != lib.ErrConnectionFailed {
+		if err != client.ErrConnectionFailed {
 			return false, -1, err
 		}
 		return false, -1, nil
@@ -87,7 +87,7 @@ func getExecExitCode(cli *DockerCli, execID string) (bool, int, error) {
 	resp, err := cli.client.ContainerExecInspect(execID)
 	if err != nil {
 		// If we can't connect, then the daemon probably died.
-		if err != lib.ErrConnectionFailed {
+		if err != client.ErrConnectionFailed {
 			return false, -1, err
 		}
 		return false, -1, nil
diff --git a/api/client/version.go b/api/client/version.go
index 83ba89660b6e6..a64deef69ac39 100644
--- a/api/client/version.go
+++ b/api/client/version.go
@@ -5,11 +5,11 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/dockerversion"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/utils"
+	"github.com/docker/engine-api/types"
 )
 
 var versionTemplate = `Client:
diff --git a/api/client/volume.go b/api/client/volume.go
index 53ad3da7806e7..284e30c3cb586 100644
--- a/api/client/volume.go
+++ b/api/client/volume.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"text/tabwriter"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/opts"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
 )
 
 // CmdVolume is the parent subcommand for all volume commands
diff --git a/api/common.go b/api/common.go
index ca7f0dc869898..96064a83a1bbe 100644
--- a/api/common.go
+++ b/api/common.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/system"
 	"github.com/docker/docker/pkg/version"
+	"github.com/docker/engine-api/types"
 	"github.com/docker/libtrust"
 )
 
diff --git a/api/common_test.go b/api/common_test.go
index a513c75212ccb..4f36b454716c8 100644
--- a/api/common_test.go
+++ b/api/common_test.go
@@ -7,7 +7,7 @@ import (
 
 	"os"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 type ports struct {
diff --git a/api/server/router/build/build_routes.go b/api/server/router/build/build_routes.go
index 0fec49586b942..2962d87f3568d 100644
--- a/api/server/router/build/build_routes.go
+++ b/api/server/router/build/build_routes.go
@@ -13,8 +13,6 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/builder"
 	"github.com/docker/docker/builder/dockerfile"
 	"github.com/docker/docker/daemon/daemonbuilder"
@@ -25,6 +23,8 @@ import (
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/utils"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 	"github.com/docker/go-units"
 	"golang.org/x/net/context"
 )
diff --git a/api/server/router/container/backend.go b/api/server/router/container/backend.go
index cdb50bca8126b..80bed6442e554 100644
--- a/api/server/router/container/backend.go
+++ b/api/server/router/container/backend.go
@@ -4,12 +4,12 @@ import (
 	"io"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/daemon/exec"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/version"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 )
 
 // execBackend includes functions to implement to provide exec functionality.
diff --git a/api/server/router/container/container_routes.go b/api/server/router/container/container_routes.go
index 5fde7866970e8..8a7de24fe15ca 100644
--- a/api/server/router/container/container_routes.go
+++ b/api/server/router/container/container_routes.go
@@ -12,9 +12,6 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/distribution/registry/api/errcode"
 	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	timetypes "github.com/docker/docker/api/types/time"
 	"github.com/docker/docker/daemon"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/pkg/ioutils"
@@ -22,6 +19,9 @@ import (
 	"github.com/docker/docker/pkg/term"
 	"github.com/docker/docker/runconfig"
 	"github.com/docker/docker/utils"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
+	timetypes "github.com/docker/engine-api/types/time"
 	"golang.org/x/net/context"
 	"golang.org/x/net/websocket"
 )
diff --git a/api/server/router/container/copy.go b/api/server/router/container/copy.go
index 4f04f94a3c50e..69584b31f540d 100644
--- a/api/server/router/container/copy.go
+++ b/api/server/router/container/copy.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 	"golang.org/x/net/context"
 )
 
diff --git a/api/server/router/container/exec.go b/api/server/router/container/exec.go
index b2735638c88fc..caa5da061d1c2 100644
--- a/api/server/router/container/exec.go
+++ b/api/server/router/container/exec.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/docker/docker/utils"
+	"github.com/docker/engine-api/types"
 	"golang.org/x/net/context"
 )
 
diff --git a/api/server/router/local/image.go b/api/server/router/local/image.go
index 450c6dd65e16c..b43c8ddc2fe6c 100644
--- a/api/server/router/local/image.go
+++ b/api/server/router/local/image.go
@@ -11,14 +11,14 @@ import (
 
 	"github.com/docker/distribution/digest"
 	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/builder/dockerfile"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/runconfig"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 	"golang.org/x/net/context"
 )
 
diff --git a/api/server/router/network/backend.go b/api/server/router/network/backend.go
index c3d6101db6ca8..9b62e0c33fe63 100644
--- a/api/server/router/network/backend.go
+++ b/api/server/router/network/backend.go
@@ -1,7 +1,7 @@
 package network
 
 import (
-	"github.com/docker/docker/api/types/network"
+	"github.com/docker/engine-api/types/network"
 
 	"github.com/docker/libnetwork"
 )
diff --git a/api/server/router/network/filter.go b/api/server/router/network/filter.go
index 58bdb10449b08..31d8d0c521524 100644
--- a/api/server/router/network/filter.go
+++ b/api/server/router/network/filter.go
@@ -5,8 +5,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/runconfig"
+	"github.com/docker/engine-api/types/filters"
 	"github.com/docker/libnetwork"
 )
 
diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go
index 86ef6854c186f..7ba59bd47407a 100644
--- a/api/server/router/network/network_routes.go
+++ b/api/server/router/network/network_routes.go
@@ -8,11 +8,11 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/runconfig"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
+	"github.com/docker/engine-api/types/network"
 	"github.com/docker/libnetwork"
 )
 
diff --git a/api/server/router/system/backend.go b/api/server/router/system/backend.go
index bc218087d9373..8a270027ff8c0 100644
--- a/api/server/router/system/backend.go
+++ b/api/server/router/system/backend.go
@@ -1,9 +1,9 @@
 package system
 
 import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/events"
+	"github.com/docker/engine-api/types/filters"
 )
 
 // Backend is the methods that need to be implemented to provide
diff --git a/api/server/router/system/system_routes.go b/api/server/router/system/system_routes.go
index afd60a00429a4..40ec748a886b9 100644
--- a/api/server/router/system/system_routes.go
+++ b/api/server/router/system/system_routes.go
@@ -8,11 +8,11 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api"
 	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	timetypes "github.com/docker/docker/api/types/time"
 	"github.com/docker/docker/pkg/ioutils"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/events"
+	"github.com/docker/engine-api/types/filters"
+	timetypes "github.com/docker/engine-api/types/time"
 	"golang.org/x/net/context"
 )
 
diff --git a/api/server/router/volume/backend.go b/api/server/router/volume/backend.go
index 0c09b073e2310..ede5dc4d91963 100644
--- a/api/server/router/volume/backend.go
+++ b/api/server/router/volume/backend.go
@@ -2,7 +2,7 @@ package volume
 
 import (
 	// TODO return types need to be refactored into pkg
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 )
 
 // Backend is the methods that need to be implemented to provide
diff --git a/api/server/router/volume/volume_routes.go b/api/server/router/volume/volume_routes.go
index 882de3a60b354..feef77cb5707d 100644
--- a/api/server/router/volume/volume_routes.go
+++ b/api/server/router/volume/volume_routes.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 	"golang.org/x/net/context"
 )
 
diff --git a/api/types/client.go b/api/types/client.go
index c936235173f1b..77d94f33a1e1b 100644
--- a/api/types/client.go
+++ b/api/types/client.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"net"
 
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/engine-api/types/container"
+	"github.com/docker/engine-api/types/filters"
 	"github.com/docker/go-units"
 )
 
diff --git a/api/types/configs.go b/api/types/configs.go
index 43ea4c10a5e52..fafbb5b53e1d9 100644
--- a/api/types/configs.go
+++ b/api/types/configs.go
@@ -1,6 +1,6 @@
 package types
 
-import "github.com/docker/docker/api/types/container"
+import "github.com/docker/engine-api/types/container"
 
 // configs holds structs used for internal communication between the
 // frontend (such as an http server) and the backend (such as the
diff --git a/api/types/container/config.go b/api/types/container/config.go
index 5459b5dbafbe1..b4e6205d2161c 100644
--- a/api/types/container/config.go
+++ b/api/types/container/config.go
@@ -1,7 +1,7 @@
 package container
 
 import (
-	"github.com/docker/docker/api/types/strslice"
+	"github.com/docker/engine-api/types/strslice"
 	"github.com/docker/go-connections/nat"
 )
 
diff --git a/api/types/container/host_config.go b/api/types/container/host_config.go
index 623e5d108f92c..ac425921b87f7 100644
--- a/api/types/container/host_config.go
+++ b/api/types/container/host_config.go
@@ -3,8 +3,8 @@ package container
 import (
 	"strings"
 
-	"github.com/docker/docker/api/types/blkiodev"
-	"github.com/docker/docker/api/types/strslice"
+	"github.com/docker/engine-api/types/blkiodev"
+	"github.com/docker/engine-api/types/strslice"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
 )
diff --git a/api/types/types.go b/api/types/types.go
index 80780ca9b0767..5f9e018998e43 100644
--- a/api/types/types.go
+++ b/api/types/types.go
@@ -4,9 +4,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/registry"
+	"github.com/docker/engine-api/types/container"
+	"github.com/docker/engine-api/types/network"
+	"github.com/docker/engine-api/types/registry"
 	"github.com/docker/go-connections/nat"
 )
 
diff --git a/api/types/versions/v1p19/types.go b/api/types/versions/v1p19/types.go
index dc131505453d8..4ed433588114d 100644
--- a/api/types/versions/v1p19/types.go
+++ b/api/types/versions/v1p19/types.go
@@ -2,9 +2,9 @@
 package v1p19
 
 import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/versions/v1p20"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
+	"github.com/docker/engine-api/types/versions/v1p20"
 	"github.com/docker/go-connections/nat"
 )
 
diff --git a/api/types/versions/v1p20/types.go b/api/types/versions/v1p20/types.go
index fa395ac1f6c71..ed800061faeb1 100644
--- a/api/types/versions/v1p20/types.go
+++ b/api/types/versions/v1p20/types.go
@@ -2,8 +2,8 @@
 package v1p20
 
 import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 	"github.com/docker/go-connections/nat"
 )
 
diff --git a/builder/builder.go b/builder/builder.go
index 90ab204f8ed3e..0defa613dc5cd 100644
--- a/builder/builder.go
+++ b/builder/builder.go
@@ -9,8 +9,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 )
 
 // Context represents a file system tree.
diff --git a/builder/dockerfile/builder.go b/builder/dockerfile/builder.go
index 8951793bff9a7..70d3db01df263 100644
--- a/builder/dockerfile/builder.go
+++ b/builder/dockerfile/builder.go
@@ -10,11 +10,11 @@ import (
 	"sync"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/builder"
 	"github.com/docker/docker/builder/dockerfile/parser"
 	"github.com/docker/docker/pkg/stringid"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 )
 
 var validCommitCommands = map[string]bool{
diff --git a/builder/dockerfile/dispatchers.go b/builder/dockerfile/dispatchers.go
index 53e6322bfb022..ea674edc5c948 100644
--- a/builder/dockerfile/dispatchers.go
+++ b/builder/dockerfile/dispatchers.go
@@ -18,13 +18,13 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/strslice"
 	"github.com/docker/docker/builder"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/docker/pkg/system"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
+	"github.com/docker/engine-api/types/container"
+	"github.com/docker/engine-api/types/strslice"
 	"github.com/docker/go-connections/nat"
 )
 
diff --git a/builder/dockerfile/internals.go b/builder/dockerfile/internals.go
index 24c9087eae7d3..bf5880f0935df 100644
--- a/builder/dockerfile/internals.go
+++ b/builder/dockerfile/internals.go
@@ -20,9 +20,6 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/strslice"
 	"github.com/docker/docker/builder"
 	"github.com/docker/docker/builder/dockerfile/parser"
 	"github.com/docker/docker/pkg/archive"
@@ -36,6 +33,9 @@ import (
 	"github.com/docker/docker/pkg/tarsum"
 	"github.com/docker/docker/pkg/urlutil"
 	"github.com/docker/docker/runconfig/opts"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
+	"github.com/docker/engine-api/types/strslice"
 )
 
 func (b *Builder) commit(id string, autoCmd *strslice.StrSlice, comment string) error {
diff --git a/builder/image.go b/builder/image.go
index 4de620fae661d..2e545cfa9d5b4 100644
--- a/builder/image.go
+++ b/builder/image.go
@@ -1,6 +1,6 @@
 package builder
 
-import "github.com/docker/docker/api/types/container"
+import "github.com/docker/engine-api/types/container"
 
 // Image represents a Docker image used by the builder.
 type Image interface {
diff --git a/cliconfig/config.go b/cliconfig/config.go
index 7e657ecbd2dc4..f5b2be8a40db3 100644
--- a/cliconfig/config.go
+++ b/cliconfig/config.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/homedir"
+	"github.com/docker/engine-api/types"
 )
 
 const (
diff --git a/cliconfig/config_test.go b/cliconfig/config_test.go
index 147f5adbd6f49..17f9fd673b103 100644
--- a/cliconfig/config_test.go
+++ b/cliconfig/config_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/homedir"
+	"github.com/docker/engine-api/types"
 )
 
 func TestEmptyConfigDir(t *testing.T) {
diff --git a/container/archive.go b/container/archive.go
index a7dd87fb84b06..95b6828575668 100644
--- a/container/archive.go
+++ b/container/archive.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/archive"
+	"github.com/docker/engine-api/types"
 )
 
 // ResolvePath resolves the given path in the container to a resource on the
diff --git a/container/container.go b/container/container.go
index a4ae82cf20313..9974a70725c7c 100644
--- a/container/container.go
+++ b/container/container.go
@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/daemon/exec"
 	"github.com/docker/docker/daemon/execdriver"
 	"github.com/docker/docker/daemon/logger"
@@ -25,6 +24,7 @@ import (
 	"github.com/docker/docker/pkg/symlink"
 	"github.com/docker/docker/runconfig"
 	"github.com/docker/docker/volume"
+	containertypes "github.com/docker/engine-api/types/container"
 	"github.com/docker/go-connections/nat"
 	"github.com/opencontainers/runc/libcontainer/label"
 )
diff --git a/container/container_unit_test.go b/container/container_unit_test.go
index f14dc12e97726..67b829f9f912c 100644
--- a/container/container_unit_test.go
+++ b/container/container_unit_test.go
@@ -3,8 +3,8 @@ package container
 import (
 	"testing"
 
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/signal"
+	"github.com/docker/engine-api/types/container"
 )
 
 func TestContainerStopSignal(t *testing.T) {
diff --git a/container/container_unix.go b/container/container_unix.go
index c9afcaa0c069d..361c77c15b0bd 100644
--- a/container/container_unix.go
+++ b/container/container_unix.go
@@ -13,8 +13,6 @@ import (
 	"syscall"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/daemon/execdriver"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/pkg/chrootarchive"
@@ -22,6 +20,8 @@ import (
 	"github.com/docker/docker/pkg/system"
 	"github.com/docker/docker/utils"
 	"github.com/docker/docker/volume"
+	"github.com/docker/engine-api/types/container"
+	"github.com/docker/engine-api/types/network"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/libnetwork"
 	"github.com/docker/libnetwork/netlabel"
diff --git a/container/container_windows.go b/container/container_windows.go
index cd8134472f79e..af68086f8d6a6 100644
--- a/container/container_windows.go
+++ b/container/container_windows.go
@@ -3,9 +3,9 @@
 package container
 
 import (
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/daemon/execdriver"
 	"github.com/docker/docker/volume"
+	"github.com/docker/engine-api/types/container"
 )
 
 // Container holds fields specific to the Windows implementation. See
diff --git a/container/monitor.go b/container/monitor.go
index 8098f23baef6b..c8665421189b7 100644
--- a/container/monitor.go
+++ b/container/monitor.go
@@ -9,12 +9,12 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/daemon/execdriver"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/utils"
+	"github.com/docker/engine-api/types/container"
 )
 
 const (
diff --git a/daemon/archive.go b/daemon/archive.go
index 1c3cec0e9d354..4ac667d261895 100644
--- a/daemon/archive.go
+++ b/daemon/archive.go
@@ -7,11 +7,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/chrootarchive"
 	"github.com/docker/docker/pkg/ioutils"
+	"github.com/docker/engine-api/types"
 )
 
 // ErrExtractPointNotDirectory is used to convey that the operation to extract
diff --git a/daemon/commit.go b/daemon/commit.go
index d8495ac65e163..d0c4924e8eb84 100644
--- a/daemon/commit.go
+++ b/daemon/commit.go
@@ -7,8 +7,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/image"
@@ -16,6 +14,8 @@ import (
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types"
+	containertypes "github.com/docker/engine-api/types/container"
 	"github.com/docker/go-connections/nat"
 )
 
diff --git a/daemon/config.go b/daemon/config.go
index b6477a6f33b05..8e46713bc90f4 100644
--- a/daemon/config.go
+++ b/daemon/config.go
@@ -1,9 +1,9 @@
 package daemon
 
 import (
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/opts"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/engine-api/types/container"
 )
 
 const (
diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go
index fceb2da42c02e..6820d4b155f48 100644
--- a/daemon/container_operations_unix.go
+++ b/daemon/container_operations_unix.go
@@ -13,8 +13,6 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	containertypes "github.com/docker/docker/api/types/container"
-	networktypes "github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/daemon/execdriver"
 	"github.com/docker/docker/daemon/links"
@@ -25,6 +23,8 @@ import (
 	"github.com/docker/docker/pkg/mount"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/runconfig"
+	containertypes "github.com/docker/engine-api/types/container"
+	networktypes "github.com/docker/engine-api/types/network"
 	"github.com/docker/go-units"
 	"github.com/docker/libnetwork"
 	"github.com/docker/libnetwork/netlabel"
diff --git a/daemon/create.go b/daemon/create.go
index 7456a997979c4..12e944932029a 100644
--- a/daemon/create.go
+++ b/daemon/create.go
@@ -2,8 +2,6 @@ package daemon
 
 import (
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/image"
@@ -11,6 +9,8 @@ import (
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/stringid"
 	volumestore "github.com/docker/docker/volume/store"
+	"github.com/docker/engine-api/types"
+	containertypes "github.com/docker/engine-api/types/container"
 	"github.com/opencontainers/runc/libcontainer/label"
 )
 
diff --git a/daemon/create_unix.go b/daemon/create_unix.go
index 865400caccde7..0f2f4d0270eb1 100644
--- a/daemon/create_unix.go
+++ b/daemon/create_unix.go
@@ -6,12 +6,12 @@ import (
 	"os"
 	"path/filepath"
 
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/volume"
+	containertypes "github.com/docker/engine-api/types/container"
 	"github.com/opencontainers/runc/libcontainer/label"
 )
 
diff --git a/daemon/create_windows.go b/daemon/create_windows.go
index 6e6ec9c12e917..54b0ab6ab717a 100644
--- a/daemon/create_windows.go
+++ b/daemon/create_windows.go
@@ -3,11 +3,11 @@ package daemon
 import (
 	"fmt"
 
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/volume"
+	containertypes "github.com/docker/engine-api/types/container"
 )
 
 // createContainerPlatformSpecificSettings performs platform specific container create functionality
diff --git a/daemon/daemon.go b/daemon/daemon.go
index 849a97b9dff45..b23543a52acc3 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -22,17 +22,17 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
-	eventtypes "github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/api/types/strslice"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/daemon/events"
 	"github.com/docker/docker/daemon/exec"
 	"github.com/docker/docker/daemon/execdriver"
 	"github.com/docker/docker/daemon/execdriver/execdrivers"
+	"github.com/docker/engine-api/types"
+	containertypes "github.com/docker/engine-api/types/container"
+	eventtypes "github.com/docker/engine-api/types/events"
+	"github.com/docker/engine-api/types/filters"
+	registrytypes "github.com/docker/engine-api/types/registry"
+	"github.com/docker/engine-api/types/strslice"
 	// register graph drivers
 	_ "github.com/docker/docker/daemon/graphdriver/register"
 	"github.com/docker/docker/daemon/logger"
diff --git a/daemon/daemon_experimental.go b/daemon/daemon_experimental.go
index 9ff05271a196f..cc3852c853d9f 100644
--- a/daemon/daemon_experimental.go
+++ b/daemon/daemon_experimental.go
@@ -9,8 +9,8 @@ import (
 	"runtime"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/idtools"
+	"github.com/docker/engine-api/types/container"
 )
 
 func setupRemappedRoot(config *Config) ([]idtools.IDMap, []idtools.IDMap, error) {
diff --git a/daemon/daemon_stub.go b/daemon/daemon_stub.go
index 20b22630712c9..d60f063847646 100644
--- a/daemon/daemon_stub.go
+++ b/daemon/daemon_stub.go
@@ -5,9 +5,9 @@ package daemon
 import (
 	"os"
 
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/system"
+	"github.com/docker/engine-api/types/container"
 )
 
 func setupRemappedRoot(config *Config) ([]idtools.IDMap, []idtools.IDMap, error) {
diff --git a/daemon/daemon_test.go b/daemon/daemon_test.go
index a46712b47ac3d..0d927f76ae78a 100644
--- a/daemon/daemon_test.go
+++ b/daemon/daemon_test.go
@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/pkg/graphdb"
 	"github.com/docker/docker/pkg/truncindex"
@@ -15,6 +14,7 @@ import (
 	volumedrivers "github.com/docker/docker/volume/drivers"
 	"github.com/docker/docker/volume/local"
 	"github.com/docker/docker/volume/store"
+	containertypes "github.com/docker/engine-api/types/container"
 	"github.com/docker/go-connections/nat"
 )
 
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
index 5186b29107dc5..78ca7595acfcc 100644
--- a/daemon/daemon_unix.go
+++ b/daemon/daemon_unix.go
@@ -12,8 +12,6 @@ import (
 	"syscall"
 
 	"github.com/Sirupsen/logrus"
-	pblkiodev "github.com/docker/docker/api/types/blkiodev"
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/image"
@@ -24,6 +22,8 @@ import (
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/runconfig"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
+	pblkiodev "github.com/docker/engine-api/types/blkiodev"
+	containertypes "github.com/docker/engine-api/types/container"
 	"github.com/docker/libnetwork"
 	nwconfig "github.com/docker/libnetwork/config"
 	"github.com/docker/libnetwork/drivers/bridge"
diff --git a/daemon/daemon_unix_test.go b/daemon/daemon_unix_test.go
index 083b2bd45be66..8a99b4b884289 100644
--- a/daemon/daemon_unix_test.go
+++ b/daemon/daemon_unix_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types/container"
 )
 
 func TestAdjustCPUShares(t *testing.T) {
diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go
index a85f14c7e4069..1e36892e01270 100644
--- a/daemon/daemon_windows.go
+++ b/daemon/daemon_windows.go
@@ -9,13 +9,13 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/daemon/graphdriver"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/layer"
 	"github.com/docker/docker/reference"
+	containertypes "github.com/docker/engine-api/types/container"
 	// register the windows graph driver
 	"github.com/docker/docker/daemon/graphdriver/windows"
 	"github.com/docker/docker/pkg/system"
diff --git a/daemon/daemonbuilder/builder.go b/daemon/daemonbuilder/builder.go
index e28650860414d..fba603909171e 100644
--- a/daemon/daemonbuilder/builder.go
+++ b/daemon/daemonbuilder/builder.go
@@ -10,8 +10,6 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/builder"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/image"
@@ -22,6 +20,8 @@ import (
 	"github.com/docker/docker/pkg/urlutil"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 )
 
 // Docker implements builder.Backend for the docker Daemon object.
diff --git a/daemon/daemonbuilder/image.go b/daemon/daemonbuilder/image.go
index 34dbe3007c3c7..0683a08275bfe 100644
--- a/daemon/daemonbuilder/image.go
+++ b/daemon/daemonbuilder/image.go
@@ -1,8 +1,8 @@
 package daemonbuilder
 
 import (
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/image"
+	"github.com/docker/engine-api/types/container"
 )
 
 type imgWrap struct {
diff --git a/daemon/delete.go b/daemon/delete.go
index c513cd8ddde48..af9903f508267 100644
--- a/daemon/delete.go
+++ b/daemon/delete.go
@@ -5,11 +5,11 @@ import (
 	"path"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/container"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/layer"
 	volumestore "github.com/docker/docker/volume/store"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerRm removes the container id from the filesystem. An error
diff --git a/daemon/delete_test.go b/daemon/delete_test.go
index 487bb5d4e3d92..e0e6466a9cc70 100644
--- a/daemon/delete_test.go
+++ b/daemon/delete_test.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
+	"github.com/docker/engine-api/types"
+	containertypes "github.com/docker/engine-api/types/container"
 )
 
 func TestContainerDoubleDelete(t *testing.T) {
diff --git a/daemon/events.go b/daemon/events.go
index 3211679c10d7a..825ce8a0d16a9 100644
--- a/daemon/events.go
+++ b/daemon/events.go
@@ -3,8 +3,8 @@ package daemon
 import (
 	"strings"
 
-	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/container"
+	"github.com/docker/engine-api/types/events"
 	"github.com/docker/libnetwork"
 )
 
diff --git a/daemon/events/events.go b/daemon/events/events.go
index 6f44e7c500fe6..a8cd66fd99a66 100644
--- a/daemon/events/events.go
+++ b/daemon/events/events.go
@@ -4,8 +4,8 @@ import (
 	"sync"
 	"time"
 
-	eventtypes "github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/pkg/pubsub"
+	eventtypes "github.com/docker/engine-api/types/events"
 )
 
 const (
diff --git a/daemon/events/events_test.go b/daemon/events/events_test.go
index a782636370edb..fc3b84bb85406 100644
--- a/daemon/events/events_test.go
+++ b/daemon/events/events_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/api/types/events"
+	"github.com/docker/engine-api/types/events"
 )
 
 func TestEventsLog(t *testing.T) {
diff --git a/daemon/events/filter.go b/daemon/events/filter.go
index fc4fa7aae1caf..8936e371d23bc 100644
--- a/daemon/events/filter.go
+++ b/daemon/events/filter.go
@@ -1,9 +1,9 @@
 package events
 
 import (
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types/events"
+	"github.com/docker/engine-api/types/filters"
 )
 
 // Filter can filter out docker events from a stream
diff --git a/daemon/events_test.go b/daemon/events_test.go
index 7035ebd06b2f8..acc285ed60956 100644
--- a/daemon/events_test.go
+++ b/daemon/events_test.go
@@ -3,9 +3,9 @@ package daemon
 import (
 	"testing"
 
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/daemon/events"
+	containertypes "github.com/docker/engine-api/types/container"
 )
 
 func TestLogContainerCopyLabels(t *testing.T) {
diff --git a/daemon/exec.go b/daemon/exec.go
index fb4094182101e..464dd5db66156 100644
--- a/daemon/exec.go
+++ b/daemon/exec.go
@@ -6,8 +6,6 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/strslice"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/daemon/exec"
 	"github.com/docker/docker/daemon/execdriver"
@@ -15,6 +13,8 @@ import (
 	"github.com/docker/docker/pkg/pools"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/docker/docker/pkg/term"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/strslice"
 )
 
 func (d *Daemon) registerExecCommand(container *container.Container, config *exec.Config) {
diff --git a/daemon/exec_unix.go b/daemon/exec_unix.go
index 40bd2c8ab872b..754f73138a1aa 100644
--- a/daemon/exec_unix.go
+++ b/daemon/exec_unix.go
@@ -3,9 +3,9 @@
 package daemon
 
 import (
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/daemon/execdriver"
+	"github.com/docker/engine-api/types"
 )
 
 // setPlatformSpecificExecProcessConfig sets platform-specific fields in the
diff --git a/daemon/exec_windows.go b/daemon/exec_windows.go
index f1b93bf02a6de..09efa82a2e3e9 100644
--- a/daemon/exec_windows.go
+++ b/daemon/exec_windows.go
@@ -1,9 +1,9 @@
 package daemon
 
 import (
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/daemon/execdriver"
+	"github.com/docker/engine-api/types"
 )
 
 // setPlatformSpecificExecProcessConfig sets platform-specific fields in the
diff --git a/daemon/execdriver/windows/info.go b/daemon/execdriver/windows/info.go
index 5a92f5d6dc9be..5e26e879c4a7d 100644
--- a/daemon/execdriver/windows/info.go
+++ b/daemon/execdriver/windows/info.go
@@ -3,8 +3,8 @@
 package windows
 
 import (
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/daemon/execdriver"
+	"github.com/docker/engine-api/types/container"
 )
 
 type info struct {
diff --git a/daemon/execdriver/windows/windows.go b/daemon/execdriver/windows/windows.go
index 810f452ed5a0b..03949ad5a6cdd 100644
--- a/daemon/execdriver/windows/windows.go
+++ b/daemon/execdriver/windows/windows.go
@@ -8,10 +8,10 @@ import (
 	"sync"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/daemon/execdriver"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/pkg/parsers"
+	"github.com/docker/engine-api/types/container"
 )
 
 // This is a daemon development variable only and should not be
diff --git a/daemon/image_delete.go b/daemon/image_delete.go
index b2aacfb606751..5de9f558592a1 100644
--- a/daemon/image_delete.go
+++ b/daemon/image_delete.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/container"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types"
 )
 
 // ImageDelete deletes the image referenced by the given imageRef from this
diff --git a/daemon/images.go b/daemon/images.go
index a5ed6b18f3ae9..2b2a994b1ee34 100644
--- a/daemon/images.go
+++ b/daemon/images.go
@@ -5,11 +5,11 @@ import (
 	"path"
 	"sort"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/layer"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
 )
 
 var acceptedImageFilterTags = map[string]bool{
diff --git a/daemon/import.go b/daemon/import.go
index 80d2146c2383f..c04e8a38f29d5 100644
--- a/daemon/import.go
+++ b/daemon/import.go
@@ -8,7 +8,6 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/layer"
@@ -16,6 +15,7 @@ import (
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types/container"
 )
 
 // ImportImage imports an image, getting the archived layer data either from
diff --git a/daemon/info.go b/daemon/info.go
index 83fe68fcb9912..d060a14fdf486 100644
--- a/daemon/info.go
+++ b/daemon/info.go
@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/pkg/fileutils"
 	"github.com/docker/docker/pkg/parsers/kernel"
@@ -18,6 +17,7 @@ import (
 	"github.com/docker/docker/registry"
 	"github.com/docker/docker/utils"
 	"github.com/docker/docker/volume/drivers"
+	"github.com/docker/engine-api/types"
 )
 
 // SystemInfo returns information about the host server the daemon is running on.
diff --git a/daemon/inspect.go b/daemon/inspect.go
index b1e4eb43a7921..098d43df5d7c9 100644
--- a/daemon/inspect.go
+++ b/daemon/inspect.go
@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	networktypes "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/versions/v1p20"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/daemon/exec"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/pkg/version"
+	"github.com/docker/engine-api/types"
+	networktypes "github.com/docker/engine-api/types/network"
+	"github.com/docker/engine-api/types/versions/v1p20"
 )
 
 // ContainerInspect returns low-level information about a
diff --git a/daemon/inspect_unix.go b/daemon/inspect_unix.go
index 27aad9057c241..b9321f34c39ef 100644
--- a/daemon/inspect_unix.go
+++ b/daemon/inspect_unix.go
@@ -3,9 +3,9 @@
 package daemon
 
 import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions/v1p19"
 	"github.com/docker/docker/container"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/versions/v1p19"
 )
 
 // This sets platform-specific fields
diff --git a/daemon/inspect_windows.go b/daemon/inspect_windows.go
index 330bc901dc06c..e42a61dadc10b 100644
--- a/daemon/inspect_windows.go
+++ b/daemon/inspect_windows.go
@@ -1,8 +1,8 @@
 package daemon
 
 import (
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/container"
+	"github.com/docker/engine-api/types"
 )
 
 // This sets platform-specific fields
diff --git a/daemon/list.go b/daemon/list.go
index 2e9ff83310080..c5765e387adb4 100644
--- a/daemon/list.go
+++ b/daemon/list.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/pkg/graphdb"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
 	"github.com/docker/go-connections/nat"
 )
 
diff --git a/daemon/network.go b/daemon/network.go
index a3282517dec09..4dba9a80e1cd6 100644
--- a/daemon/network.go
+++ b/daemon/network.go
@@ -6,9 +6,9 @@ import (
 	"net"
 	"strings"
 
-	"github.com/docker/docker/api/types/network"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/runconfig"
+	"github.com/docker/engine-api/types/network"
 	"github.com/docker/libnetwork"
 )
 
diff --git a/daemon/network/settings.go b/daemon/network/settings.go
index 1bf4b5a672b9b..823bec2696282 100644
--- a/daemon/network/settings.go
+++ b/daemon/network/settings.go
@@ -1,7 +1,7 @@
 package network
 
 import (
-	networktypes "github.com/docker/docker/api/types/network"
+	networktypes "github.com/docker/engine-api/types/network"
 	"github.com/docker/go-connections/nat"
 )
 
diff --git a/daemon/start.go b/daemon/start.go
index 54cb94884ffbe..43734fc3173b1 100644
--- a/daemon/start.go
+++ b/daemon/start.go
@@ -4,10 +4,10 @@ import (
 	"runtime"
 
 	"github.com/Sirupsen/logrus"
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/runconfig"
+	containertypes "github.com/docker/engine-api/types/container"
 )
 
 // ContainerStart starts a container.
diff --git a/daemon/stats.go b/daemon/stats.go
index e2b2420ca4675..9812dce575e5d 100644
--- a/daemon/stats.go
+++ b/daemon/stats.go
@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions/v1p20"
 	"github.com/docker/docker/daemon/execdriver"
 	"github.com/docker/docker/pkg/version"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/versions/v1p20"
 )
 
 // ContainerStatsConfig holds information for configuring the runtime
diff --git a/daemon/stats_freebsd.go b/daemon/stats_freebsd.go
index 1898ca9d40503..44c330aab6258 100644
--- a/daemon/stats_freebsd.go
+++ b/daemon/stats_freebsd.go
@@ -1,7 +1,7 @@
 package daemon
 
 import (
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 	"github.com/opencontainers/runc/libcontainer"
 )
 
diff --git a/daemon/stats_linux.go b/daemon/stats_linux.go
index 466f2df5e78d8..201552a4e1310 100644
--- a/daemon/stats_linux.go
+++ b/daemon/stats_linux.go
@@ -1,7 +1,7 @@
 package daemon
 
 import (
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runc/libcontainer/cgroups"
 )
diff --git a/daemon/stats_windows.go b/daemon/stats_windows.go
index fc8991ba2af55..0f47cf09e0f03 100644
--- a/daemon/stats_windows.go
+++ b/daemon/stats_windows.go
@@ -1,7 +1,7 @@
 package daemon
 
 import (
-	"github.com/docker/docker/api/types"
+	"github.com/docker/engine-api/types"
 	"github.com/opencontainers/runc/libcontainer"
 )
 
diff --git a/daemon/top_unix.go b/daemon/top_unix.go
index 7bee57af2e576..22dac6f218c09 100644
--- a/daemon/top_unix.go
+++ b/daemon/top_unix.go
@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/api/types"
 	derr "github.com/docker/docker/errors"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerTop lists the processes running inside of the given
diff --git a/daemon/top_windows.go b/daemon/top_windows.go
index f224b2e2d215f..dc4cace65d50e 100644
--- a/daemon/top_windows.go
+++ b/daemon/top_windows.go
@@ -1,8 +1,8 @@
 package daemon
 
 import (
-	"github.com/docker/docker/api/types"
 	derr "github.com/docker/docker/errors"
+	"github.com/docker/engine-api/types"
 )
 
 // ContainerTop is not supported on Windows and returns an error.
diff --git a/daemon/update.go b/daemon/update.go
index 5699901e75201..6f07e92584ddd 100644
--- a/daemon/update.go
+++ b/daemon/update.go
@@ -3,7 +3,7 @@ package daemon
 import (
 	"fmt"
 
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types/container"
 )
 
 // ContainerUpdate updates resources of the container
diff --git a/daemon/volumes.go b/daemon/volumes.go
index df95af79aaffe..a7b648a56f501 100644
--- a/daemon/volumes.go
+++ b/daemon/volumes.go
@@ -6,12 +6,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/daemon/execdriver"
 	derr "github.com/docker/docker/errors"
 	"github.com/docker/docker/volume"
+	"github.com/docker/engine-api/types"
+	containertypes "github.com/docker/engine-api/types/container"
 	"github.com/opencontainers/runc/libcontainer/label"
 )
 
diff --git a/distribution/pull.go b/distribution/pull.go
index cddc40e24eba3..db6e29d681f83 100644
--- a/distribution/pull.go
+++ b/distribution/pull.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/distribution/metadata"
 	"github.com/docker/docker/distribution/xfer"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
+	"github.com/docker/engine-api/types"
 	"golang.org/x/net/context"
 )
 
diff --git a/distribution/push.go b/distribution/push.go
index 9c49d40857a91..b4dec42952526 100644
--- a/distribution/push.go
+++ b/distribution/push.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/distribution/metadata"
 	"github.com/docker/docker/distribution/xfer"
 	"github.com/docker/docker/image"
@@ -16,6 +15,7 @@ import (
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
+	"github.com/docker/engine-api/types"
 	"github.com/docker/libtrust"
 	"golang.org/x/net/context"
 )
diff --git a/distribution/registry.go b/distribution/registry.go
index 49346f07461ad..d39a44411f634 100644
--- a/distribution/registry.go
+++ b/distribution/registry.go
@@ -16,10 +16,10 @@ import (
 	"github.com/docker/distribution/registry/client"
 	"github.com/docker/distribution/registry/client/auth"
 	"github.com/docker/distribution/registry/client/transport"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/distribution/xfer"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
+	"github.com/docker/engine-api/types"
 	"golang.org/x/net/context"
 )
 
diff --git a/distribution/registry_unit_test.go b/distribution/registry_unit_test.go
index 53bf6324a6570..ac1019b3c9b01 100644
--- a/distribution/registry_unit_test.go
+++ b/distribution/registry_unit_test.go
@@ -8,11 +8,11 @@ import (
 	"testing"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
 	"github.com/docker/docker/utils"
+	"github.com/docker/engine-api/types"
+	registrytypes "github.com/docker/engine-api/types/registry"
 	"golang.org/x/net/context"
 )
 
diff --git a/image/image.go b/image/image.go
index c0508c1b98c19..b33b0b8402dbb 100644
--- a/image/image.go
+++ b/image/image.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types/container"
 )
 
 // ID is the content-addressable ID of an image.
diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go
index 6e1d288e614b4..568beca238094 100644
--- a/integration-cli/docker_api_containers_test.go
+++ b/integration-cli/docker_api_containers_test.go
@@ -15,11 +15,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/integration"
 	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/docker/docker/pkg/stringid"
+	"github.com/docker/engine-api/types"
+	containertypes "github.com/docker/engine-api/types/container"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go
index 18625c5fb3129..61298d3c6876f 100644
--- a/integration-cli/docker_api_images_test.go
+++ b/integration-cli/docker_api_images_test.go
@@ -6,8 +6,8 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/engine-api/types"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_api_inspect_test.go b/integration-cli/docker_api_inspect_test.go
index 37172b039fce7..0e00638a21069 100644
--- a/integration-cli/docker_api_inspect_test.go
+++ b/integration-cli/docker_api_inspect_test.go
@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions/v1p20"
 	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/docker/docker/pkg/stringutils"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/versions/v1p20"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_api_network_test.go b/integration-cli/docker_api_network_test.go
index 5e4f2eb09460b..0552978387bf5 100644
--- a/integration-cli/docker_api_network_test.go
+++ b/integration-cli/docker_api_network_test.go
@@ -8,10 +8,10 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
+	"github.com/docker/engine-api/types/network"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_api_stats_test.go b/integration-cli/docker_api_stats_test.go
index 715012f785584..5041efbe21371 100644
--- a/integration-cli/docker_api_stats_test.go
+++ b/integration-cli/docker_api_stats_test.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/docker/docker/pkg/version"
+	"github.com/docker/engine-api/types"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_api_version_test.go b/integration-cli/docker_api_version_test.go
index eb2de5904a2ba..ccb148419035b 100644
--- a/integration-cli/docker_api_version_test.go
+++ b/integration-cli/docker_api_version_test.go
@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/engine-api/types"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_api_volumes_test.go b/integration-cli/docker_api_volumes_test.go
index 68b3c2a2cb760..eab19091ced8f 100644
--- a/integration-cli/docker_api_volumes_test.go
+++ b/integration-cli/docker_api_volumes_test.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"path/filepath"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/engine-api/types"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_cli_by_digest_test.go b/integration-cli/docker_cli_by_digest_test.go
index 75c8b4fd6fa38..446a28eadf154 100644
--- a/integration-cli/docker_cli_by_digest_test.go
+++ b/integration-cli/docker_cli_by_digest_test.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/docker/docker/pkg/stringutils"
+	"github.com/docker/engine-api/types"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_cli_inspect_experimental_test.go b/integration-cli/docker_cli_inspect_experimental_test.go
index c6e9c5c89ff94..9ba3df0eff744 100644
--- a/integration-cli/docker_cli_inspect_experimental_test.go
+++ b/integration-cli/docker_cli_inspect_experimental_test.go
@@ -3,8 +3,8 @@
 package main
 
 import (
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/engine-api/types"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go
index 52c6ad3a73244..986ed29821c9a 100644
--- a/integration-cli/docker_cli_inspect_test.go
+++ b/integration-cli/docker_cli_inspect_test.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/container"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
index 7a4a497cdf772..9615642214384 100644
--- a/integration-cli/docker_cli_network_unix_test.go
+++ b/integration-cli/docker_cli_network_unix_test.go
@@ -13,10 +13,10 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions/v1p20"
 	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/docker/docker/runconfig"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/versions/v1p20"
 	"github.com/docker/libnetwork/driverapi"
 	remoteapi "github.com/docker/libnetwork/drivers/remote/api"
 	"github.com/docker/libnetwork/ipamapi"
diff --git a/integration-cli/docker_cli_update_unix_test.go b/integration-cli/docker_cli_update_unix_test.go
index cb1cfee892989..612efbe58b01e 100644
--- a/integration-cli/docker_cli_update_unix_test.go
+++ b/integration-cli/docker_cli_update_unix_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/engine-api/types"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go
index 17611581e1d26..55bd1295c7745 100644
--- a/integration-cli/docker_utils.go
+++ b/integration-cli/docker_utils.go
@@ -22,12 +22,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/httputils"
 	"github.com/docker/docker/pkg/integration"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/stringutils"
+	"github.com/docker/engine-api/types"
 	"github.com/docker/go-connections/sockets"
 	"github.com/docker/go-connections/tlsconfig"
 	"github.com/go-check/check"
diff --git a/registry/auth.go b/registry/auth.go
index 34d5d6702bd71..7175598c71ec4 100644
--- a/registry/auth.go
+++ b/registry/auth.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
+	"github.com/docker/engine-api/types"
+	registrytypes "github.com/docker/engine-api/types/registry"
 )
 
 // Login tries to register/login to the registry server.
diff --git a/registry/auth_test.go b/registry/auth_test.go
index ff1bd547156e2..caff8667d143d 100644
--- a/registry/auth_test.go
+++ b/registry/auth_test.go
@@ -3,8 +3,8 @@ package registry
 import (
 	"testing"
 
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
+	"github.com/docker/engine-api/types"
+	registrytypes "github.com/docker/engine-api/types/registry"
 )
 
 func buildAuthConfigs() map[string]types.AuthConfig {
diff --git a/registry/config.go b/registry/config.go
index 9708d036347cc..ec8ec271c98c3 100644
--- a/registry/config.go
+++ b/registry/config.go
@@ -7,10 +7,10 @@ import (
 	"net/url"
 	"strings"
 
-	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/opts"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/reference"
+	registrytypes "github.com/docker/engine-api/types/registry"
 )
 
 // Options holds command line options.
diff --git a/registry/endpoint.go b/registry/endpoint.go
index 43ac9053fb74b..258a9c2854cef 100644
--- a/registry/endpoint.go
+++ b/registry/endpoint.go
@@ -13,7 +13,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/registry/client/transport"
-	registrytypes "github.com/docker/docker/api/types/registry"
+	registrytypes "github.com/docker/engine-api/types/registry"
 )
 
 // for mocking in unit tests
diff --git a/registry/registry_mock_test.go b/registry/registry_mock_test.go
index be04e34689754..057afac10dab3 100644
--- a/registry/registry_mock_test.go
+++ b/registry/registry_mock_test.go
@@ -15,9 +15,9 @@ import (
 	"testing"
 	"time"
 
-	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/reference"
+	registrytypes "github.com/docker/engine-api/types/registry"
 	"github.com/gorilla/mux"
 
 	"github.com/Sirupsen/logrus"
diff --git a/registry/registry_test.go b/registry/registry_test.go
index 46d2818fb743f..7630d9a523f56 100644
--- a/registry/registry_test.go
+++ b/registry/registry_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 
 	"github.com/docker/distribution/registry/client/transport"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types"
+	registrytypes "github.com/docker/engine-api/types/registry"
 )
 
 var (
diff --git a/registry/service.go b/registry/service.go
index 7223cbd8f3587..dbdf1731138b1 100644
--- a/registry/service.go
+++ b/registry/service.go
@@ -6,9 +6,9 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types"
+	registrytypes "github.com/docker/engine-api/types/registry"
 )
 
 // Service is a registry service. It tracks configuration data such as a list
diff --git a/registry/session.go b/registry/session.go
index 494b84bf5af8f..57acbc0cf64e7 100644
--- a/registry/session.go
+++ b/registry/session.go
@@ -19,13 +19,13 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/pkg/httputils"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/tarsum"
 	"github.com/docker/docker/reference"
+	"github.com/docker/engine-api/types"
+	registrytypes "github.com/docker/engine-api/types/registry"
 )
 
 var (
diff --git a/registry/types.go b/registry/types.go
index da3eaacb3f912..ee88276e4ec41 100644
--- a/registry/types.go
+++ b/registry/types.go
@@ -1,8 +1,8 @@
 package registry
 
 import (
-	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/reference"
+	registrytypes "github.com/docker/engine-api/types/registry"
 )
 
 // RepositoryData tracks the image list, list of endpoints, and list of tokens
diff --git a/runconfig/compare.go b/runconfig/compare.go
index 81f16b0a35205..e774ba22948ba 100644
--- a/runconfig/compare.go
+++ b/runconfig/compare.go
@@ -1,6 +1,6 @@
 package runconfig
 
-import "github.com/docker/docker/api/types/container"
+import "github.com/docker/engine-api/types/container"
 
 // Compare two Config struct. Do not compare the "Image" nor "Hostname" fields
 // If OpenStdin is set, then it differs
diff --git a/runconfig/compare_test.go b/runconfig/compare_test.go
index ed7528d67b3c7..e67f659ef97a1 100644
--- a/runconfig/compare_test.go
+++ b/runconfig/compare_test.go
@@ -3,8 +3,8 @@ package runconfig
 import (
 	"testing"
 
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/strslice"
+	"github.com/docker/engine-api/types/container"
+	"github.com/docker/engine-api/types/strslice"
 	"github.com/docker/go-connections/nat"
 )
 
diff --git a/runconfig/config.go b/runconfig/config.go
index d12457393c735..f40da2275af6f 100644
--- a/runconfig/config.go
+++ b/runconfig/config.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/volume"
+	"github.com/docker/engine-api/types/container"
 )
 
 // DecodeContainerConfig decodes a json encoded config into a ContainerConfigWrapper
diff --git a/runconfig/config_test.go b/runconfig/config_test.go
index 7a1c785c2f395..8c8cb15b00837 100644
--- a/runconfig/config_test.go
+++ b/runconfig/config_test.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/strslice"
+	"github.com/docker/engine-api/types/container"
+	"github.com/docker/engine-api/types/strslice"
 )
 
 type f struct {
diff --git a/runconfig/config_unix.go b/runconfig/config_unix.go
index 05af155f5d3b3..7bff0a278342d 100644
--- a/runconfig/config_unix.go
+++ b/runconfig/config_unix.go
@@ -2,7 +2,7 @@
 
 package runconfig
 
-import "github.com/docker/docker/api/types/container"
+import "github.com/docker/engine-api/types/container"
 
 // ContainerConfigWrapper is a Config wrapper that hold the container Config (portable)
 // and the corresponding HostConfig (non-portable).
diff --git a/runconfig/config_windows.go b/runconfig/config_windows.go
index 6ff7afcdafde9..c8d387becd0c0 100644
--- a/runconfig/config_windows.go
+++ b/runconfig/config_windows.go
@@ -1,6 +1,6 @@
 package runconfig
 
-import "github.com/docker/docker/api/types/container"
+import "github.com/docker/engine-api/types/container"
 
 // ContainerConfigWrapper is a Config wrapper that hold the container Config (portable)
 // and the corresponding HostConfig (non-portable).
diff --git a/runconfig/hostconfig.go b/runconfig/hostconfig.go
index 2b81d02c206af..769cc9f5dae4c 100644
--- a/runconfig/hostconfig.go
+++ b/runconfig/hostconfig.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types/container"
 )
 
 // DecodeHostConfig creates a HostConfig based on the specified Reader.
diff --git a/runconfig/hostconfig_test.go b/runconfig/hostconfig_test.go
index 941c16d6e8615..ef82a7143fc52 100644
--- a/runconfig/hostconfig_test.go
+++ b/runconfig/hostconfig_test.go
@@ -8,7 +8,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types/container"
 )
 
 // TODO Windows: This will need addressing for a Windows daemon.
diff --git a/runconfig/hostconfig_unix.go b/runconfig/hostconfig_unix.go
index 4c28799395193..7875d82e2539a 100644
--- a/runconfig/hostconfig_unix.go
+++ b/runconfig/hostconfig_unix.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types/container"
 )
 
 // DefaultDaemonNetworkMode returns the default network stack the daemon should
diff --git a/runconfig/hostconfig_windows.go b/runconfig/hostconfig_windows.go
index 3cade744ad73b..56aa17181974f 100644
--- a/runconfig/hostconfig_windows.go
+++ b/runconfig/hostconfig_windows.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/engine-api/types/container"
 )
 
 // DefaultDaemonNetworkMode returns the default network stack the daemon should
diff --git a/runconfig/opts/parse.go b/runconfig/opts/parse.go
index ad3c0eeaab7c7..6f7c7cde7e108 100644
--- a/runconfig/opts/parse.go
+++ b/runconfig/opts/parse.go
@@ -6,12 +6,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/strslice"
 	"github.com/docker/docker/opts"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/mount"
 	"github.com/docker/docker/pkg/signal"
+	"github.com/docker/engine-api/types/container"
+	"github.com/docker/engine-api/types/strslice"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
 )
diff --git a/runconfig/opts/parse_test.go b/runconfig/opts/parse_test.go
index 2c7e100ef9e37..58a853ac822e3 100644
--- a/runconfig/opts/parse_test.go
+++ b/runconfig/opts/parse_test.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/api/types/container"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/runconfig"
+	"github.com/docker/engine-api/types/container"
 	"github.com/docker/go-connections/nat"
 )
 
diff --git a/runconfig/opts/throttledevice.go b/runconfig/opts/throttledevice.go
index 1f206b48f04b2..acb00ed5f7d1b 100644
--- a/runconfig/opts/throttledevice.go
+++ b/runconfig/opts/throttledevice.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/api/types/blkiodev"
+	"github.com/docker/engine-api/types/blkiodev"
 	"github.com/docker/go-units"
 )
 
diff --git a/runconfig/opts/weightdevice.go b/runconfig/opts/weightdevice.go
index 4d9aa932356a3..bd3c0b178a27b 100644
--- a/runconfig/opts/weightdevice.go
+++ b/runconfig/opts/weightdevice.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/api/types/blkiodev"
+	"github.com/docker/engine-api/types/blkiodev"
 )
 
 // ValidatorWeightFctType defines a validator function that returns a validated struct and/or an error.