diff --git a/components/engine/api/client.go b/components/engine/api/client.go
index c724d08269..f1f336d5f4 100644
--- a/components/engine/api/client.go
+++ b/components/engine/api/client.go
@@ -1572,7 +1572,7 @@ func (cli *DockerCli) CmdAttach(args ...string) error {
 		return err
 	}
 
-	if !container.State.IsRunning() {
+	if !container.State.Running {
 		return fmt.Errorf("Impossible to attach to a stopped container, start it first")
 	}
 
@@ -2355,7 +2355,7 @@ func getExitCode(cli *DockerCli, containerId string) (bool, int, error) {
 	if err := json.Unmarshal(body, c); err != nil {
 		return false, -1, err
 	}
-	return c.State.IsRunning(), c.State.GetExitCode(), nil
+	return c.State.Running, c.State.ExitCode, nil
 }
 
 func readBody(stream io.ReadCloser, statusCode int, err error) ([]byte, int, error) {
diff --git a/components/engine/api/container.go b/components/engine/api/container.go
new file mode 100644
index 0000000000..4cc73b2252
--- /dev/null
+++ b/components/engine/api/container.go
@@ -0,0 +1,18 @@
+package api
+
+import (
+	"github.com/dotcloud/docker/nat"
+	"github.com/dotcloud/docker/runconfig"
+)
+
+type Container struct {
+	Config     runconfig.Config
+	HostConfig runconfig.HostConfig
+	State      struct {
+		Running  bool
+		ExitCode int
+	}
+	NetworkSettings struct {
+		Ports nat.PortMap
+	}
+}
diff --git a/components/engine/docker/docker.go b/components/engine/docker/docker.go
index 5b0d279a5b..b4d7879397 100644
--- a/components/engine/docker/docker.go
+++ b/components/engine/docker/docker.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"strings"
 
+	_ "github.com/dotcloud/docker"
 	"github.com/dotcloud/docker/api"
 	"github.com/dotcloud/docker/dockerversion"
 	"github.com/dotcloud/docker/engine"