3 files changed, 9 insertions, 5 deletions
diff --git a/compiler/nimfix/nimfix.nim b/compiler/nimfix/nimfix.nim
index 7b42537c4..0c5e2a88b 100644
--- a/compiler/nimfix/nimfix.nim
+++ b/compiler/nimfix/nimfix.nim
@@ -10,8 +10,9 @@
 ## Nimfix is a tool that helps to convert old-style Nimrod code to Nim code.
 
 import strutils, os, parseopt
-import options, commands, modules, sem, passes, passaux, pretty, msgs, nimconf,
-  extccomp, condsyms, lists
+import compiler/options, compiler/commands, compiler/modules, compiler/sem,
+       compiler/passes, compiler/passaux, pretty, compiler/msgs,
+       compiler/nimconf, compiler/extccomp, compiler/condsyms, compiler/lists
 
 const Usage = """
 Nimfix - Tool to patch Nim code
diff --git a/compiler/nimfix/pretty.nim b/compiler/nimfix/pretty.nim
index acac574af..081a1d372 100644
--- a/compiler/nimfix/pretty.nim
+++ b/compiler/nimfix/pretty.nim
@@ -11,8 +11,10 @@
 ## to convert Nim code into a consistent style.
 
 import 
-  strutils, os, options, ast, astalgo, msgs, ropes, idents,
-  intsets, strtabs, semdata, prettybase
+  strutils, os, intsets, strtabs, ropes,
+  compiler/options, compiler/ast, compiler/astalgo,
+  compiler/msgs, compiler/idents, compiler/semdata,
+  prettybase
 
 type
   StyleCheck* {.pure.} = enum None, Warn, Auto
diff --git a/compiler/nimfix/prettybase.nim b/compiler/nimfix/prettybase.nim
index 225b78479..839c1ff8f 100644
--- a/compiler/nimfix/prettybase.nim
+++ b/compiler/nimfix/prettybase.nim
@@ -7,7 +7,8 @@
 #    distribution, for details about the copyright.
 #
 
-import ast, msgs, strutils, idents, lexbase, streams
+import strutils, lexbase, streams, compiler/ast, compiler/msgs,
+       compiler/idents
 from os import splitFile
 
 type