diff --git a/compiler/passes.nim b/compiler/passes.nim
index d7c1816768..6ff3f2bb5d 100644
--- a/compiler/passes.nim
+++ b/compiler/passes.nim
@@ -166,7 +166,7 @@ proc processModule*(graph: ModuleGraph; module: PSym, stream: PLLStream,
     p: TParsers
     a: TPassContextArray
     s: PLLStream
-    fileIdx = FileIndex module.fileIdx
+    fileIdx = module.fileIdx
   if module.id < 0:
     # new module caching mechanism:
     for i in 0..<gPassesLen:
diff --git a/compiler/reorder.nim b/compiler/reorder.nim
index 878e3b11e5..56d8d58864 100644
--- a/compiler/reorder.nim
+++ b/compiler/reorder.nim
@@ -429,7 +429,7 @@ proc reorder*(graph: ModuleGraph, n: PNode, module: PSym, cache: IdentCache): PN
   if n.hasForbiddenPragma:
     return n
   var includedFiles = initIntSet()
-  let mpath = module.fileIdx.FileIndex.toFullPath
+  let mpath = module.fileIdx.toFullPath
   let n = expandIncludes(graph, module, n, mpath,
                           includedFiles, cache).splitSections
   result = newNodeI(nkStmtList, n.info)
diff --git a/compiler/rodread.nim b/compiler/rodread.nim
index aa699e337c..f55c3279cb 100644
--- a/compiler/rodread.nim
+++ b/compiler/rodread.nim
@@ -915,7 +915,7 @@ proc handleSymbolFile*(module: PSym; cache: IdentCache): PRodReader =
     module.id = getID()
     return nil
   idgen.loadMaxIds(options.gProjectPath / options.gProjectName)
-  let fileIdx = FileIndex module.fileIdx
+  let fileIdx = module.fileIdx
   discard checkDep(fileIdx, cache)
   if gMods[fileIdx.int32].reason == rrEmpty: internalError("handleSymbolFile")
   result = gMods[fileIdx.int32].rd