4 files changed, 13 insertions, 10 deletions
diff --git a/middleware/errors/errors.go b/middleware/errors/errors.go
index 8936b8945..ef178d1a3 100644
--- a/middleware/errors/errors.go
+++ b/middleware/errors/errors.go
@@ -9,6 +9,8 @@ import (
 	"time"
 
 	"github.com/miekg/coredns/middleware"
+	"github.com/miekg/coredns/middleware/pkg/roller"
+	"github.com/miekg/coredns/request"
 
 	"github.com/miekg/dns"
 	"golang.org/x/net/context"
@@ -19,7 +21,7 @@ type ErrorHandler struct {
 	Next      middleware.Handler
 	LogFile   string
 	Log       *log.Logger
-	LogRoller *middleware.LogRoller
+	LogRoller *roller.LogRoller
 	Debug     bool // if true, errors are written out to client rather than to a log
 }
 
@@ -29,7 +31,7 @@ func (h ErrorHandler) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns
 	rcode, err := h.Next.ServeDNS(ctx, w, r)
 
 	if err != nil {
-		state := middleware.State{W: w, Req: r}
+		state := request.Request{W: w, Req: r}
 		errMsg := fmt.Sprintf("%s [ERROR %d %s %s] %v", time.Now().Format(timeFormat), rcode, state.Name(), state.Type(), err)
 
 		if h.Debug {
@@ -53,7 +55,7 @@ func (h ErrorHandler) recovery(ctx context.Context, w dns.ResponseWriter, r *dns
 		return
 	}
 
-	state := middleware.State{W: w, Req: r}
+	state := request.Request{W: w, Req: r}
 	// Obtain source of panic
 	// From: https://gist.github.com/swdunlop/9629168
 	var name, file string // function name, file name
diff --git a/middleware/errors/errors_test.go b/middleware/errors/errors_test.go
index 6885aae0f..4c8f56fa2 100644
--- a/middleware/errors/errors_test.go
+++ b/middleware/errors/errors_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/miekg/coredns/middleware"
+	"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
 	"github.com/miekg/coredns/middleware/test"
 
 	"github.com/miekg/dns"
@@ -47,7 +48,7 @@ func TestErrors(t *testing.T) {
 	for i, tc := range tests {
 		em.Next = tc.next
 		buf.Reset()
-		rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
+		rec := dnsrecorder.New(&test.ResponseWriter{})
 		code, err := em.ServeDNS(ctx, rec, req)
 
 		if err != tc.expectedErr {
@@ -78,7 +79,7 @@ func TestVisibleErrorWithPanic(t *testing.T) {
 	req := new(dns.Msg)
 	req.SetQuestion("example.org.", dns.TypeA)
 
-	rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
+	rec := dnsrecorder.New(&test.ResponseWriter{})
 
 	code, err := eh.ServeDNS(ctx, rec, req)
 	if code != 0 {
diff --git a/middleware/errors/setup.go b/middleware/errors/setup.go
index e1c77373d..5c7c1016c 100644
--- a/middleware/errors/setup.go
+++ b/middleware/errors/setup.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/miekg/coredns/core/dnsserver"
-	"github.com/miekg/coredns/middleware"
+	"github.com/miekg/coredns/middleware/pkg/roller"
 
 	"github.com/hashicorp/go-syslog"
 	"github.com/mholt/caddy"
@@ -93,7 +93,7 @@ func errorsParse(c *caddy.Controller) (ErrorHandler, error) {
 					if c.NextArg() {
 						if c.Val() == "{" {
 							c.IncrNest()
-							logRoller, err := middleware.ParseRoller(c)
+							logRoller, err := roller.Parse(c)
 							if err != nil {
 								return hadBlock, err
 							}
diff --git a/middleware/errors/setup_test.go b/middleware/errors/setup_test.go
index 6e5a85d08..c1dbf7267 100644
--- a/middleware/errors/setup_test.go
+++ b/middleware/errors/setup_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/mholt/caddy"
-	"github.com/miekg/coredns/middleware"
+	"github.com/miekg/coredns/middleware/pkg/roller"
 )
 
 func TestErrorsParse(t *testing.T) {
@@ -29,7 +29,7 @@ func TestErrorsParse(t *testing.T) {
 		}},
 		{`errors { log errors.txt { size 2 age 10 keep 3 } }`, false, ErrorHandler{
 			LogFile: "errors.txt",
-			LogRoller: &middleware.LogRoller{
+			LogRoller: &roller.LogRoller{
 				MaxSize:    2,
 				MaxAge:     10,
 				MaxBackups: 3,
@@ -43,7 +43,7 @@ func TestErrorsParse(t *testing.T) {
         }
 }`, false, ErrorHandler{
 			LogFile: "errors.txt",
-			LogRoller: &middleware.LogRoller{
+			LogRoller: &roller.LogRoller{
 				MaxSize:    3,
 				MaxAge:     11,
 				MaxBackups: 5,