diff --git a/src/google/protobuf/compiler/cpp/parse_function_generator.cc b/src/google/protobuf/compiler/cpp/parse_function_generator.cc
index a0773f0bac..c9dcbe11f0 100644
--- a/src/google/protobuf/compiler/cpp/parse_function_generator.cc
+++ b/src/google/protobuf/compiler/cpp/parse_function_generator.cc
@@ -264,7 +264,7 @@ void ParseFunctionGenerator::GenerateDataDecls(io::Printer* printer) {
   auto field_num_to_entry_table = MakeNumToEntryTable(ordered_fields_);
   format(
       "friend class ::$proto_ns$::internal::TcParser;\n"
-      "static const ::$proto_ns$::internal::"
+      "PROTOBUF_EXPORT static const ::$proto_ns$::internal::"
       "TcParseTable<$1$, $2$, $3$, $4$, $5$> _table_;\n",
       tc_table_info_->table_size_log2, ordered_fields_.size(),
       tc_table_info_->aux_entries.size(),
@@ -406,7 +406,7 @@ void ParseFunctionGenerator::GenerateTailCallTable(Formatter& format) {
   // unknown fields and potentially an extension range.
   auto field_num_to_entry_table = MakeNumToEntryTable(ordered_fields_);
   format(
-      "constexpr ::_pbi::TcParseTable<$1$, $2$, $3$, $4$, $5$> "
+      "PROTOBUF_EXPORT constexpr ::_pbi::TcParseTable<$1$, $2$, $3$, $4$, $5$> "
       "$classname$::_table_ = "
       "{\n",
       tc_table_info_->table_size_log2, ordered_fields_.size(),