diff --git a/vlib/v/builder/cc.v b/vlib/v/builder/cc.v
index b6e0cce3f7..4eee8b3ad8 100644
--- a/vlib/v/builder/cc.v
+++ b/vlib/v/builder/cc.v
@@ -126,11 +126,6 @@ fn (mut v Builder) post_process_c_compiler_output(res os.Result) {
 }
 
 fn (mut v Builder) rebuild_cached_module(vexe string, imp_path string) string {
-	// TODO: move this check somewhere else, this is really not the best place for it :/
-	// strconv is already imported inside builtin, so skip generating its object file
-	if imp_path in ['vlib/strconv', 'vlib/strings'] {
-		return ''
-	}
 	res := v.pref.cache_manager.exists('.o', imp_path) or {
 		println('Cached $imp_path .o file not found... Building .o file for $imp_path')
 		// do run `v build-module x` always in main vfolder; x can be a relative path
@@ -375,6 +370,12 @@ fn (mut v Builder) cc() {
 			for ast_file in v.parsed_files {
 				for imp_stmt in ast_file.imports {
 					imp := imp_stmt.mod
+					// strconv is already imported inside builtin, so skip generating its object file
+					// TODO: incase we have other modules with the same name, make sure they are vlib
+					// is this even doign anything?
+					if imp in ['strconv', 'strings'] {
+						continue
+					}
 					if imp in built_modules {
 						continue
 					}
@@ -395,12 +396,12 @@ fn (mut v Builder) cc() {
 					// if os.is_dir(af_base_dir + os.path_separator + mod_path) {
 					// continue
 					// }
-					mod_path := imp.replace('.', os.path_separator)
-					imp_path := os.join_path('vlib', mod_path)
-					// imp_path := v.find_module_path(imp, ast_file.path) or {
-					//	verror('cannot import module "$imp" (not found)')
-					//	break
-					//}
+					// mod_path := imp.replace('.', os.path_separator)
+					// imp_path := os.join_path('vlib', mod_path)
+					imp_path := v.find_module_path(imp, ast_file.path) or {
+						verror('cannot import module "$imp" (not found)')
+						break
+					}
 					obj_path := v.rebuild_cached_module(vexe, imp_path)
 					libs += ' ' + obj_path
 					if obj_path.ends_with('vlib/ui.o') {
diff --git a/vlib/v/gen/cgen.v b/vlib/v/gen/cgen.v
index 512ce84942..1ccd05b2ef 100644
--- a/vlib/v/gen/cgen.v
+++ b/vlib/v/gen/cgen.v
@@ -941,6 +941,7 @@ fn (mut g Gen) stmt(node ast.Stmt) {
 				// println('!!! $node.name mod=$node.mod, built=$g.module_built')
 				// }
 				// TODO true for not just "builtin"
+				// TODO: clean this up
 				mod := if g.is_builtin_mod { 'builtin' } else { node.name.all_before_last('.') }
 				if (mod != g.module_built &&
 					node.mod != g.module_built.after('/')) ||