diff --git a/ha_rocksdb.h b/ha_rocksdb.h
index f6f9358b22a8..d9188debbdc2 100644
--- a/ha_rocksdb.h
+++ b/ha_rocksdb.h
@@ -596,7 +596,6 @@ class ha_rocksdb: public handler
   ulong index_flags(uint inx, uint part, bool all_parts) const;
 
   const key_map * keys_to_use_for_scanning()
-    __attribute__((__returns_nonnull__))
   {
     return &key_map_full;
   }
diff --git a/ha_rocksdb_proto.h b/ha_rocksdb_proto.h
index cf6cda597611..b5f1e2ec0afc 100644
--- a/ha_rocksdb_proto.h
+++ b/ha_rocksdb_proto.h
@@ -46,15 +46,15 @@ void request_save_stats();
 
 class Dict_manager;
 Dict_manager *get_dict_manager(void)
-  __attribute__((__returns_nonnull__, __warn_unused_result__));
+  __attribute__((__warn_unused_result__));
 
 class Table_ddl_manager;
 Table_ddl_manager *get_ddl_manager(void)
-  __attribute__((__returns_nonnull__, __warn_unused_result__));
+  __attribute__((__warn_unused_result__));
 
 class Binlog_info_manager;
 Binlog_info_manager *get_binlog_manager(void)
-  __attribute__((__returns_nonnull__, __warn_unused_result__));
+  __attribute__((__warn_unused_result__));
 
 }  // namespace myrocks