diff --git a/vlib/builtin/builtin_nix.v b/vlib/builtin/builtin_nix.c.v
similarity index 100%
rename from vlib/builtin/builtin_nix.v
rename to vlib/builtin/builtin_nix.c.v
diff --git a/vlib/builtin/builtin_windows.v b/vlib/builtin/builtin_windows.c.v
similarity index 100%
rename from vlib/builtin/builtin_windows.v
rename to vlib/builtin/builtin_windows.c.v
diff --git a/vlib/builtin/cfns.v b/vlib/builtin/cfns.c.v
similarity index 100%
rename from vlib/builtin/cfns.v
rename to vlib/builtin/cfns.c.v
diff --git a/vlib/clipboard/clipboard_darwin.v b/vlib/clipboard/clipboard_darwin.c.v
similarity index 100%
rename from vlib/clipboard/clipboard_darwin.v
rename to vlib/clipboard/clipboard_darwin.c.v
diff --git a/vlib/clipboard/clipboard_linux.v b/vlib/clipboard/clipboard_linux.c.v
similarity index 100%
rename from vlib/clipboard/clipboard_linux.v
rename to vlib/clipboard/clipboard_linux.c.v
diff --git a/vlib/clipboard/clipboard_solaris.v b/vlib/clipboard/clipboard_solaris.c.v
similarity index 100%
rename from vlib/clipboard/clipboard_solaris.v
rename to vlib/clipboard/clipboard_solaris.c.v
diff --git a/vlib/clipboard/clipboard_windows.v b/vlib/clipboard/clipboard_windows.c.v
similarity index 100%
rename from vlib/clipboard/clipboard_windows.v
rename to vlib/clipboard/clipboard_windows.c.v
diff --git a/vlib/mysql/_cdefs.v b/vlib/mysql/_cdefs.c.v
similarity index 100%
rename from vlib/mysql/_cdefs.v
rename to vlib/mysql/_cdefs.c.v
diff --git a/vlib/net/http/backend_nix.v b/vlib/net/http/backend_nix.c.v
similarity index 100%
rename from vlib/net/http/backend_nix.v
rename to vlib/net/http/backend_nix.c.v
diff --git a/vlib/net/http/backend_windows.v b/vlib/net/http/backend_windows.c.v
similarity index 100%
rename from vlib/net/http/backend_windows.v
rename to vlib/net/http/backend_windows.c.v
diff --git a/vlib/net/http/download_nix.v b/vlib/net/http/download_nix.c.v
similarity index 100%
rename from vlib/net/http/download_nix.v
rename to vlib/net/http/download_nix.c.v
diff --git a/vlib/net/http/download_windows.v b/vlib/net/http/download_windows.c.v
similarity index 100%
rename from vlib/net/http/download_windows.v
rename to vlib/net/http/download_windows.c.v
diff --git a/vlib/net/init_nix.v b/vlib/net/init_nix.c.v
similarity index 100%
rename from vlib/net/init_nix.v
rename to vlib/net/init_nix.c.v
diff --git a/vlib/net/init_windows.v b/vlib/net/init_windows.c.v
similarity index 100%
rename from vlib/net/init_windows.v
rename to vlib/net/init_windows.c.v
diff --git a/vlib/os/const_nix.v b/vlib/os/const_nix.c.v
similarity index 100%
rename from vlib/os/const_nix.v
rename to vlib/os/const_nix.c.v
diff --git a/vlib/os/const_windows.v b/vlib/os/const_windows.c.v
similarity index 100%
rename from vlib/os/const_windows.v
rename to vlib/os/const_windows.c.v
diff --git a/vlib/os/os_darwin.v b/vlib/os/os_darwin.c.v
similarity index 100%
rename from vlib/os/os_darwin.v
rename to vlib/os/os_darwin.c.v
diff --git a/vlib/os/os_linux.v b/vlib/os/os_linux.c.v
similarity index 100%
rename from vlib/os/os_linux.v
rename to vlib/os/os_linux.c.v
diff --git a/vlib/os/os_windows.v b/vlib/os/os_windows.c.v
similarity index 100%
rename from vlib/os/os_windows.v
rename to vlib/os/os_windows.c.v
diff --git a/vlib/os2/os2_darwin.v b/vlib/os2/os2_darwin.c.v
similarity index 100%
rename from vlib/os2/os2_darwin.v
rename to vlib/os2/os2_darwin.c.v
diff --git a/vlib/readline/readline_js.v b/vlib/readline/readline.js.v
similarity index 100%
rename from vlib/readline/readline_js.v
rename to vlib/readline/readline.js.v
diff --git a/vlib/readline/readline_darwin.v b/vlib/readline/readline_darwin.c.v
similarity index 100%
rename from vlib/readline/readline_darwin.v
rename to vlib/readline/readline_darwin.c.v
diff --git a/vlib/readline/readline_linux.v b/vlib/readline/readline_linux.c.v
similarity index 100%
rename from vlib/readline/readline_linux.v
rename to vlib/readline/readline_linux.c.v
diff --git a/vlib/readline/readline_solaris.v b/vlib/readline/readline_solaris.c.v
similarity index 100%
rename from vlib/readline/readline_solaris.v
rename to vlib/readline/readline_solaris.c.v
diff --git a/vlib/readline/readline_windows.v b/vlib/readline/readline_windows.c.v
similarity index 100%
rename from vlib/readline/readline_windows.v
rename to vlib/readline/readline_windows.c.v
diff --git a/vlib/runtime/runtime_darwin.v b/vlib/runtime/runtime_darwin.c.v
similarity index 100%
rename from vlib/runtime/runtime_darwin.v
rename to vlib/runtime/runtime_darwin.c.v
diff --git a/vlib/runtime/runtime_linux.v b/vlib/runtime/runtime_linux.c.v
similarity index 100%
rename from vlib/runtime/runtime_linux.v
rename to vlib/runtime/runtime_linux.c.v
diff --git a/vlib/runtime/runtime_nix.v b/vlib/runtime/runtime_nix.c.v
similarity index 100%
rename from vlib/runtime/runtime_nix.v
rename to vlib/runtime/runtime_nix.c.v
diff --git a/vlib/runtime/runtime_windows.v b/vlib/runtime/runtime_windows.c.v
similarity index 100%
rename from vlib/runtime/runtime_windows.v
rename to vlib/runtime/runtime_windows.c.v
diff --git a/vlib/sokol/c/c.v b/vlib/sokol/c/declaration.c.v
similarity index 100%
rename from vlib/sokol/c/c.v
rename to vlib/sokol/c/declaration.c.v
diff --git a/vlib/strings/builder_c.v b/vlib/strings/builder.c.v
similarity index 100%
rename from vlib/strings/builder_c.v
rename to vlib/strings/builder.c.v
diff --git a/vlib/strings/builder_js.v b/vlib/strings/builder.js.v
similarity index 100%
rename from vlib/strings/builder_js.v
rename to vlib/strings/builder.js.v
diff --git a/vlib/strings/strings_c.v b/vlib/strings/strings.c.v
similarity index 100%
rename from vlib/strings/strings_c.v
rename to vlib/strings/strings.c.v
diff --git a/vlib/strings/strings_js.v b/vlib/strings/strings.js.v
similarity index 100%
rename from vlib/strings/strings_js.v
rename to vlib/strings/strings.js.v
diff --git a/vlib/sync/sync_nix.v b/vlib/sync/sync_nix.c.v
similarity index 100%
rename from vlib/sync/sync_nix.v
rename to vlib/sync/sync_nix.c.v
diff --git a/vlib/sync/sync_windows.v b/vlib/sync/sync_windows.c.v
similarity index 100%
rename from vlib/sync/sync_windows.v
rename to vlib/sync/sync_windows.c.v
diff --git a/vlib/term/term_js.v b/vlib/term/term.js.v
similarity index 100%
rename from vlib/term/term_js.v
rename to vlib/term/term.js.v
diff --git a/vlib/term/term_nix.v b/vlib/term/term_nix.c.v
similarity index 100%
rename from vlib/term/term_nix.v
rename to vlib/term/term_nix.c.v
diff --git a/vlib/term/term_windows.v b/vlib/term/term_windows.c.v
similarity index 100%
rename from vlib/term/term_windows.v
rename to vlib/term/term_windows.c.v
diff --git a/vlib/time/time_nix.v b/vlib/time/time_nix.c.v
similarity index 100%
rename from vlib/time/time_nix.v
rename to vlib/time/time_nix.c.v
diff --git a/vlib/time/time_windows.v b/vlib/time/time_windows.c.v
similarity index 100%
rename from vlib/time/time_windows.v
rename to vlib/time/time_windows.c.v
diff --git a/vlib/uiold/ui_darwin.v b/vlib/uiold/ui_darwin.c.v
similarity index 100%
rename from vlib/uiold/ui_darwin.v
rename to vlib/uiold/ui_darwin.c.v
diff --git a/vlib/uiold/ui_linux.v b/vlib/uiold/ui_linux.c.v
similarity index 100%
rename from vlib/uiold/ui_linux.v
rename to vlib/uiold/ui_linux.c.v
diff --git a/vlib/uiold/ui_windows.v b/vlib/uiold/ui_windows.c.v
similarity index 100%
rename from vlib/uiold/ui_windows.v
rename to vlib/uiold/ui_windows.c.v
diff --git a/vlib/v/builder/builder.v b/vlib/v/builder/builder.v
index 910ff02d50..89f40fd506 100644
--- a/vlib/v/builder/builder.v
+++ b/vlib/v/builder/builder.v
@@ -191,32 +191,6 @@ fn (b Builder) should_compile_c(file string) bool {
 		// Probably something like `a.js.v`.
 		return false
 	}
-	// TODO Remove after vc is deployed and files have been moved
-	if file.ends_with('_js.v') {
-		return false
-	}
-	if (file.ends_with('_win.v') || file.ends_with('_windows.v')) && b.pref.os != .windows {
-		return false
-	}
-	if (file.ends_with('_lin.v') || file.ends_with('_linux.v')) && b.pref.os != .linux {
-		return false
-	}
-	if (file.ends_with('_mac.v') || file.ends_with('_darwin.v')) && b.pref.os != .mac {
-		return false
-	}
-	if file.ends_with('_nix.v') && b.pref.os == .windows {
-		return false
-	}
-	if file.ends_with('_android.v') && b.pref.os != .android {
-		return false
-	}
-	if file.ends_with('_freebsd.v') && b.pref.os != .freebsd {
-		return false
-	}
-	if file.ends_with('_solaris.v') && b.pref.os != .solaris {
-		return false
-	}
-	// End of TODO
 	if file.ends_with('_windows.c.v') && b.pref.os != .windows {
 		return false
 	}