diff --git a/BUILD b/BUILD
index 1121411d9a..d756ef0260 100644
--- a/BUILD
+++ b/BUILD
@@ -1057,6 +1057,32 @@ cc_library(
     deps = [":port"],
 )
 
+cc_binary(
+    name = "libupb.so",
+    srcs = ["upb/ffi.c"],
+    copts = UPB_DEFAULT_COPTS + ["-DUPB_BUILD_API"],
+    linkshared = 1,
+    linkstatic = 1,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//:collections",
+        "//:collections_split64",
+        "//:mem",
+        "//:message",
+        "//:message_accessors",
+        "//:message_split64",
+        "//:mini_table",
+        "//:port",
+    ],
+)
+
+cc_library(
+    name = "libupb",
+    srcs = [":libupb.so"],
+    linkstatic = 1,
+    visibility = ["//visibility:public"],
+)
+
 # Amalgamation #################################################################
 
 # begin:github_only
diff --git a/upbc/upbc_so.c b/upb/ffi.c
similarity index 82%
rename from upbc/upbc_so.c
rename to upb/ffi.c
index 571de198de..f0a3ea6fea 100644
--- a/upbc/upbc_so.c
+++ b/upb/ffi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2022, Google LLC
+ * Copyright (c) 2009-2021, Google LLC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,19 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// This disables inlining and forces all public functions to be exported to the
-// linker. It is used to generate bindings for FFIs from other languages.
-#ifndef UPB_BUILD_API
-#define UPB_BUILD_API
-#endif
+// These headers form a spanning tree for the upb defs needed by FFI layers.
 
-#include "upb/collections/array.h"
 #include "upb/collections/array_split64.h"
 #include "upb/collections/map.h"
-#include "upb/message/accessors.h"
 #include "upb/message/accessors_split64.h"
 #include "upb/message/message.h"
 #include "upb/mini_table/decode.h"
-
-// Must be last.
-#include "upb/port/def.inc"
diff --git a/upbc/BUILD b/upbc/BUILD
index 795a84d42f..8da9d15db4 100644
--- a/upbc/BUILD
+++ b/upbc/BUILD
@@ -90,25 +90,6 @@ upb_proto_reflection_library(
     deps = ["@com_google_protobuf//:compiler_plugin_proto"],
 )
 
-cc_binary(
-    name = "upbc_so",
-    srcs = ["upbc_so.c"],
-    copts = UPB_DEFAULT_COPTS,
-    linkshared = 1,
-    linkstatic = 1,
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:collections",
-        "//:collections_split64",
-        "//:mem",
-        "//:message",
-        "//:message_accessors",
-        "//:message_split64",
-        "//:mini_table",
-        "//:port",
-    ],
-)
-
 bootstrap_cc_library(
     name = "common",
     srcs = [