diff --git a/rosidl_typesupport_connext_c/src/wstring_conversion.cpp b/rosidl_typesupport_connext_c/src/wstring_conversion.cpp
index dd8c22b..5c10f75 100644
--- a/rosidl_typesupport_connext_c/src/wstring_conversion.cpp
+++ b/rosidl_typesupport_connext_c/src/wstring_conversion.cpp
@@ -14,7 +14,15 @@
 
 #include <rosidl_typesupport_connext_c/wstring_conversion.hpp>
 
+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wdeprecated-register"
+# pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
+#endif
 #include "ndds/ndds_c.h"
+#ifdef __clang__
+# pragma clang diagnostic pop
+#endif
 #include "rosidl_generator_c/u16string_functions.h"
 
 namespace rosidl_typesupport_connext_c