diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
index 04aaaad..0322511 100644
--- a/bootstrap/bootstrap.go
+++ b/bootstrap/bootstrap.go
@@ -11,6 +11,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"sort"
 )
 
 const genPackage = "github.com/mailru/easyjson/gen"
@@ -59,6 +60,7 @@ func (g *Generator) writeStub() error {
 		fmt.Fprintln(f, ")")
 	}
 
+	sort.Strings(g.Types)
 	for _, t := range g.Types {
 		fmt.Fprintln(f)
 		if !g.NoStdMarshalers {
@@ -114,6 +116,8 @@ func (g *Generator) writeMain() (path string, err error) {
 	if g.NoStdMarshalers {
 		fmt.Fprintln(f, "  g.NoStdMarshalers()")
 	}
+
+	sort.Strings(g.Types)
 	for _, v := range g.Types {
 		fmt.Fprintln(f, "  g.Add(pkg.EasyJSON_exporter_"+v+"(nil))")
 	}
diff --git a/gen/generator.go b/gen/generator.go
index db232d8..478f9cf 100644
--- a/gen/generator.go
+++ b/gen/generator.go
@@ -153,7 +153,7 @@ func (g *Generator) printHeader() {
 
 	sort.Strings(aliases)
 	fmt.Println("import (")
-	for _, alias := range g.imports {
+	for _, alias := range aliases {
 		fmt.Printf("  %s %q\n", alias, byAlias[alias])
 	}