diff --git a/CHANGES b/CHANGES
index 3001bf5715..9399b7d9a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+
+3.3.0-dev.180 | 2020-08-21 13:28:23 -0700
+
+  * Remove definition-less ThreadVal<->BrokerData conversion functions (Jon Siwek, Corelight)
+
+    Their presence/deprecation may cause "undefined reference" build
+    failures for some compilers (GCC 9.3.0 in my case).
+
 3.3.0-dev.177 | 2020-08-21 08:36:48 -0700
 
   * Add missing namespace to usage of get_exe_path in fuzzer (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index d76f8573e2..ebe90984c8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.0-dev.177
+3.3.0-dev.180
diff --git a/src/broker/Data.h b/src/broker/Data.h
index 1d2aad1118..2970c84f75 100644
--- a/src/broker/Data.h
+++ b/src/broker/Data.h
@@ -67,13 +67,6 @@ broker::expected<broker::data> val_to_data(const zeek::Val* v);
  */
 zeek::ValPtr data_to_val(broker::data d, zeek::Type* type);
 
-/**
- * Convert a zeek::threading::Value to a Broker data value.
- * @param v a zeek::threading::Value.
- * @return a Broker data value if the zeek::threading::Value could be converted to one.
- */
-broker::expected<broker::data> threading_val_to_data(const zeek::threading::Value* v);
-
 /**
  * Convert a zeek::threading::Field to a Broker data value.
  * @param f a zeek::threading::Field.
@@ -81,14 +74,6 @@ broker::expected<broker::data> threading_val_to_data(const zeek::threading::Valu
  */
 broker::data threading_field_to_data(const zeek::threading::Field* f);
 
-/**
- * Convert a Broker data value to a zeek::threading::Value.
- * @param d a Broker data value.
- * @return a pointer to a new zeek::threading::Value or a nullptr if the conversion was not
- * possible.
- */
-zeek::threading::Value* data_to_threading_val(broker::data d);
-
 /**
  * Convert a Broker data value to a zeek::threading::Value.
  * @param d a Broker data value.
@@ -327,9 +312,7 @@ inline zeek::RecordValPtr make_data_val(broker::data d)	 { return zeek::Broker::
 constexpr auto get_data_type [[deprecated("Remove in v4.1. Use zeek::Broker::detail::get_data_type.")]] = zeek::Broker::detail::get_data_type;
 constexpr auto val_to_data [[deprecated("Remove in v4.1. Use zeek::Broker::detail::val_to_data.")]] = zeek::Broker::detail::val_to_data;
 constexpr auto data_to_val [[deprecated("Remove in v4.1. Use zeek::Broker::detail::data_to_val.")]] = zeek::Broker::detail::data_to_val;
-constexpr auto threading_val_to_data [[deprecated("Remove in v4.1. Use zeek::Broker::detail::threading_val_to_data.")]] = zeek::Broker::detail::threading_val_to_data;
 constexpr auto threading_field_to_data [[deprecated("Remove in v4.1. Use zeek::Broker::detail::threading_field_to_data.")]] = zeek::Broker::detail::threading_field_to_data;
-constexpr auto data_to_threading_val [[deprecated("Remove in v4.1. Use zeek::Broker::detail::data_to_threading_val.")]] = zeek::Broker::detail::data_to_threading_val;
 constexpr auto data_to_threading_field [[deprecated("Remove in v4.1. Use zeek::Broker::detail::data_to_threading_field.")]] = zeek::Broker::detail::data_to_threading_field;
 
 using DataVal [[deprecated("Remove in v4.1. Use zeek::Broker::detail::DataVal.")]] = zeek::Broker::detail::DataVal;