#include "HsVersions.h"
#include "nativeGen/NCG.h"
-import MachInstrs
-import MachRegs
+import Instrs
+import Regs
import MachCodeGen
import PprMach
import RegAllocInfo
import NCGMonad
import PositionIndependentCode
-import RegLiveness
+import RegAlloc.Liveness
import qualified RegAlloc.Linear.Main as Linear