diff --git a/tests/bindings/lua/test.proto b/tests/bindings/lua/test.proto
deleted file mode 100644
index 322a967427..0000000000
--- a/tests/bindings/lua/test.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-syntax = "proto2";
-
-package lua_test;
-
-message TestLua {
-  map<string, double> map_string_double = 1;
-}
diff --git a/upb/textencode.h b/upb/textencode.h
index 87ceed0c06..526142421a 100644
--- a/upb/textencode.h
+++ b/upb/textencode.h
@@ -4,6 +4,10 @@
 
 #include "upb/def.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum {
   /* When set, prints everything on a single line. */
   UPB_TXTENC_SINGLELINE = 1,
@@ -24,4 +28,8 @@ size_t upb_textencode(const upb_msg *msg, const upb_msgdef *m,
                       const upb_symtab *ext_pool, int options, char *buf,
                       size_t size);
 
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
 #endif  /* UPB_TEXTENCODE_H_ */