diff --git a/src/all_types.hpp b/src/all_types.hpp
index 106ccf647..1ec3c809a 100644
--- a/src/all_types.hpp
+++ b/src/all_types.hpp
@@ -1183,7 +1183,6 @@ enum FnInline {
 struct FnExport {
     Buf name;
     GlobalLinkageId linkage;
-    AstNode *source_node;
 };
 
 struct FnTableEntry {
diff --git a/src/analyze.cpp b/src/analyze.cpp
index 470d54ff8..e2df4955d 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -2577,6 +2577,34 @@ TypeTableEntry *get_test_fn_type(CodeGen *g) {
     return g->test_fn_type;
 }
 
+void add_fn_export(CodeGen *g, FnTableEntry *fn_table_entry, Buf *symbol_name, GlobalLinkageId linkage, bool ccc) {
+    if (ccc) {
+        if (buf_eql_str(symbol_name, "main") && g->libc_link_lib != nullptr) {
+            g->have_c_main = true;
+            g->windows_subsystem_windows = false;
+            g->windows_subsystem_console = true;
+        } else if (buf_eql_str(symbol_name, "WinMain") &&
+            g->zig_target.os == ZigLLVM_Win32)
+        {
+            g->have_winmain = true;
+            g->windows_subsystem_windows = true;
+            g->windows_subsystem_console = false;
+        } else if (buf_eql_str(symbol_name, "WinMainCRTStartup") &&
+            g->zig_target.os == ZigLLVM_Win32)
+        {
+            g->have_winmain_crt_startup = true;
+        } else if (buf_eql_str(symbol_name, "DllMainCRTStartup") &&
+            g->zig_target.os == ZigLLVM_Win32)
+        {
+            g->have_dllmain_crt_startup = true;
+        }
+    }
+    FnExport *fn_export = fn_table_entry->export_list.add_one();
+    memset(fn_export, 0, sizeof(FnExport));
+    buf_init_from_buf(&fn_export->name, symbol_name);
+    fn_export->linkage = linkage;
+}
+
 static void resolve_decl_fn(CodeGen *g, TldFn *tld_fn) {
     ImportTableEntry *import = tld_fn->base.import;
     AstNode *source_node = tld_fn->base.source_node;
@@ -2588,6 +2616,11 @@ static void resolve_decl_fn(CodeGen *g, TldFn *tld_fn) {
         FnTableEntry *fn_table_entry = create_fn(source_node);
         get_fully_qualified_decl_name(&fn_table_entry->symbol_name, &tld_fn->base, '_');
 
+        if (fn_proto->is_export) {
+            bool ccc = (fn_proto->cc == CallingConventionUnspecified || fn_proto->cc == CallingConventionC);
+            add_fn_export(g, fn_table_entry, &fn_table_entry->symbol_name, GlobalLinkageIdStrong, ccc);
+        }
+
         tld_fn->fn_entry = fn_table_entry;
 
         if (fn_table_entry->body_node) {
diff --git a/src/analyze.hpp b/src/analyze.hpp
index 0e727568c..6224e64dd 100644
--- a/src/analyze.hpp
+++ b/src/analyze.hpp
@@ -183,5 +183,6 @@ TypeTableEntry *get_align_amt_type(CodeGen *g);
 PackageTableEntry *new_anonymous_package(void);
 
 Buf *const_value_to_buffer(ConstExprValue *const_val);
+void add_fn_export(CodeGen *g, FnTableEntry *fn_table_entry, Buf *symbol_name, GlobalLinkageId linkage, bool ccc);
 
 #endif
diff --git a/src/ir.cpp b/src/ir.cpp
index 78f7c25dc..4afc1a2c6 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -10504,35 +10504,11 @@ static TypeTableEntry *ir_analyze_instruction_export(IrAnalyze *ira, IrInstructi
                     add_error_note(ira->codegen, msg, fn_entry->proto_node, buf_sprintf("declared here"));
                 } break;
                 case CallingConventionC:
-                    if (buf_eql_str(symbol_name, "main") && ira->codegen->libc_link_lib != nullptr) {
-                        ira->codegen->have_c_main = true;
-                        ira->codegen->windows_subsystem_windows = false;
-                        ira->codegen->windows_subsystem_console = true;
-                    } else if (buf_eql_str(symbol_name, "WinMain") &&
-                        ira->codegen->zig_target.os == ZigLLVM_Win32)
-                    {
-                        ira->codegen->have_winmain = true;
-                        ira->codegen->windows_subsystem_windows = true;
-                        ira->codegen->windows_subsystem_console = false;
-                    } else if (buf_eql_str(symbol_name, "WinMainCRTStartup") &&
-                        ira->codegen->zig_target.os == ZigLLVM_Win32)
-                    {
-                        ira->codegen->have_winmain_crt_startup = true;
-                    } else if (buf_eql_str(symbol_name, "DllMainCRTStartup") &&
-                        ira->codegen->zig_target.os == ZigLLVM_Win32)
-                    {
-                        ira->codegen->have_dllmain_crt_startup = true;
-                    }
-                    // fallthrough
                 case CallingConventionNaked:
                 case CallingConventionCold:
-                case CallingConventionStdcall: {
-                    FnExport *fn_export = fn_entry->export_list.add_one();
-                    memset(fn_export, 0, sizeof(FnExport));
-                    buf_init_from_buf(&fn_export->name, symbol_name);
-                    fn_export->linkage = global_linkage_id;
-                    fn_export->source_node = instruction->base.source_node;
-                } break;
+                case CallingConventionStdcall:
+                    add_fn_export(ira->codegen, fn_entry, symbol_name, global_linkage_id, cc == CallingConventionC);
+                    break;
             }
         } break;
         case TypeTableEntryIdStruct:
diff --git a/src/parser.cpp b/src/parser.cpp
index a2b06410e..cc337471b 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1553,6 +1553,7 @@ static AstNode *ast_parse_variable_declaration_expr(ParseContext *pc, size_t *to
     AstNode *node = ast_create_node(pc, NodeTypeVariableDeclaration, var_token);
 
     node->data.variable_declaration.is_comptime = is_comptime;
+    node->data.variable_declaration.is_export = is_export;
     node->data.variable_declaration.is_const = is_const;
     node->data.variable_declaration.visib_mod = visib_mod;