diff --git a/nimterop/ast.nim b/nimterop/ast.nim
index b02ccfb..1cc2c6c 100644
--- a/nimterop/ast.nim
+++ b/nimterop/ast.nim
@@ -134,6 +134,9 @@ proc printNimHeader*() =
 #   $2 $3
 
 {.experimental: "codeReordering".}
+{.hint[ConvFromXtoItselfNotNeeded]: off.}
+
+import nimterop/types
 """ % [$now(), getAppFilename(), commandLineParams().join(" ")]
 
 proc printNim*(fullpath: string, root: TSNode, astTable: AstTable) =
diff --git a/nimterop/cimport.nim b/nimterop/cimport.nim
index 7fcd14d..298c8a2 100644
--- a/nimterop/cimport.nim
+++ b/nimterop/cimport.nim
@@ -2,7 +2,7 @@ import hashes, macros, os, strformat, strutils
 
 const CIMPORT {.used.} = 1
 
-import "." / [globals,types,paths]
+import "." / [globals, types, paths]
 export types
 
 proc interpPath(dir: string): string=
diff --git a/nimterop/setup.nim b/nimterop/setup.nim
index 2c1c7c0..3c7afac 100644
--- a/nimterop/setup.nim
+++ b/nimterop/setup.nim
@@ -1,6 +1,6 @@
 import os, strutils
 
-import "."/[git,paths]
+import "."/[git, paths]
 
 proc treesitterSetup*() =
   gitPull("https://github.com/tree-sitter/tree-sitter/", incDir() / "treesitter", """
@@ -12,7 +12,7 @@ src/runtime/*
 *.c
 *.h
 """)
-  
+
   # TODO: does this work on windows? if not use `os.unixToNativePath`
   let
     stack = incDir() / "treesitter/src/runtime/stack.c"
diff --git a/nimterop/treesitter/c.nim b/nimterop/treesitter/c.nim
index b4a8228..f34eaf9 100644
--- a/nimterop/treesitter/c.nim
+++ b/nimterop/treesitter/c.nim
@@ -1,6 +1,6 @@
 import strutils, os
 
-import ".."/[setup,paths]
+import ".."/[setup, paths]
 
 static:
   treesitterCSetup()
diff --git a/nimterop/treesitter/cpp.nim b/nimterop/treesitter/cpp.nim
index c0eca0c..7fc0b13 100644
--- a/nimterop/treesitter/cpp.nim
+++ b/nimterop/treesitter/cpp.nim
@@ -1,6 +1,6 @@
 import strutils, os
 
-import ".."/[setup,paths]
+import ".."/[setup, paths]
 
 static:
   treesitterCppSetup()
diff --git a/nimterop/treesitter/runtime.nim b/nimterop/treesitter/runtime.nim
index acb2289..8885400 100644
--- a/nimterop/treesitter/runtime.nim
+++ b/nimterop/treesitter/runtime.nim
@@ -2,7 +2,7 @@
 
 import strutils, os
 
-import ".."/[setup,paths]
+import ".."/[setup, paths]
 
 static:
   treesitterSetup()
@@ -16,7 +16,7 @@ when defined(Linux):
 {.passC: "-I$1/src" % sourcePath.}
 {.passC: "-I$1/../utf8proc" % sourcePath.}
 # pending https://github.com/nim-lang/Nim/issues/10299 we need to rename the
-# object files (via compile:(foo,bar)) to avoid name collisions, here 
+# object files (via compile:(foo,bar)) to avoid name collisions, here
 # and everywhere `compile` is used
 {.compile: sourcePath / "src/runtime/runtime.c".}