[#3208] remove unused code in libdns

59 files changed, 70 insertions, 6683 deletions

diff --git a/src/lib/dns/rdata/generic/afsdb_18.cc b/src/lib/dns/rdata/generic/afsdb_18.cc
deleted file mode 100644
index 5e82b03efa..0000000000
--- a/src/lib/dns/rdata/generic/afsdb_18.cc
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <string>
-#include <sstream>
-
-#include <util/buffer.h>
-#include <util/strutil.h>
-
-#include <dns/name.h>
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-#include <boost/lexical_cast.hpp>
-
-#include <dns/rdata/generic/detail/lexer_util.h>
-
-using namespace std;
-using boost::lexical_cast;
-using namespace isc::util;
-using isc::dns::rdata::generic::detail::createNameFromLexer;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-/// \brief Constructor from string.
-///
-/// \c afsdb_str must be formatted as follows:
-/// \code <subtype> <server name>
-/// \endcode
-/// where server name field must represent a valid domain name.
-///
-/// An example of valid string is:
-/// \code "1 server.example.com." \endcode
-///
-/// <b>Exceptions</b>
-///
-/// \exception InvalidRdataText The number of RDATA fields (must be 2) is
-/// incorrect.
-/// \exception std::bad_alloc Memory allocation fails.
-/// \exception Other The constructor of the \c Name class will throw if the
-/// names in the string is invalid.
-AFSDB::AFSDB(const std::string& afsdb_str) :
-    subtype_(0), server_(Name::ROOT_NAME())
-{
-    try {
-        std::istringstream ss(afsdb_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        createFromLexer(lexer, NULL);
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText, "extra input text for AFSDB: "
-                      << afsdb_str);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText, "Failed to construct AFSDB from '" <<
-                  afsdb_str << "': " << ex.what());
-    }
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual representation
-/// of an AFSDB RDATA.  The SERVER field can be non-absolute if \c origin
-/// is non-NULL, in which case \c origin is used to make it absolute.
-/// It must not be represented as a quoted string.
-///
-/// The SUBTYPE field must be a valid decimal representation of an
-/// unsigned 16-bit integer.
-///
-/// \throw MasterLexer::LexerError General parsing error such as missing field.
-/// \throw Other Exceptions from the Name and RRTTL constructors if
-/// construction of textual fields as these objects fail.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-/// \param origin If non NULL, specifies the origin of SERVER when it
-/// is non-absolute.
-AFSDB::AFSDB(MasterLexer& lexer, const Name* origin,
-       MasterLoader::Options, MasterLoaderCallbacks&) :
-    subtype_(0), server_(".")
-{
-    createFromLexer(lexer, origin);
-}
-
-void
-AFSDB::createFromLexer(MasterLexer& lexer, const Name* origin)
-{
-    const uint32_t num = lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (num > 65535) {
-        isc_throw(InvalidRdataText, "Invalid AFSDB subtype: " << num);
-    }
-    subtype_ = static_cast<uint16_t>(num);
-
-    server_ = createNameFromLexer(lexer, origin);
-}
-
-/// \brief Constructor from wire-format data.
-///
-/// This constructor doesn't check the validity of the second parameter (rdata
-/// length) for parsing.
-/// If necessary, the caller will check consistency.
-///
-/// \exception std::bad_alloc Memory allocation fails.
-/// \exception Other The constructor of the \c Name class will throw if the
-/// names in the wire is invalid.
-AFSDB::AFSDB(InputBuffer& buffer, size_t) :
-    subtype_(buffer.readUint16()), server_(buffer)
-{}
-
-/// \brief Copy constructor.
-///
-/// \exception std::bad_alloc Memory allocation fails in copying internal
-/// member variables (this should be very rare).
-AFSDB::AFSDB(const AFSDB& other) :
-    Rdata(), subtype_(other.subtype_), server_(other.server_)
-{}
-
-AFSDB&
-AFSDB::operator=(const AFSDB& source) {
-    subtype_ = source.subtype_;
-    server_ = source.server_;
-
-    return (*this);
-}
-
-/// \brief Convert the \c AFSDB to a string.
-///
-/// The output of this method is formatted as described in the "from string"
-/// constructor (\c AFSDB(const std::string&))).
-///
-/// \exception std::bad_alloc Internal resource allocation fails.
-///
-/// \return A \c string object that represents the \c AFSDB object.
-string
-AFSDB::toText() const {
-    return (lexical_cast<string>(subtype_) + " " + server_.toText());
-}
-
-/// \brief Render the \c AFSDB in the wire format without name compression.
-///
-/// \exception std::bad_alloc Internal resource allocation fails.
-///
-/// \param buffer An output buffer to store the wire data.
-void
-AFSDB::toWire(OutputBuffer& buffer) const {
-    buffer.writeUint16(subtype_);
-    server_.toWire(buffer);
-}
-
-/// \brief Render the \c AFSDB in the wire format with taking into account
-/// compression.
-///
-/// As specified in RFC3597, TYPE AFSDB is not "well-known", the server
-/// field (domain name) will not be compressed.
-///
-/// \exception std::bad_alloc Internal resource allocation fails.
-///
-/// \param renderer DNS message rendering context that encapsulates the
-/// output buffer and name compression information.
-void
-AFSDB::toWire(AbstractMessageRenderer& renderer) const {
-    renderer.writeUint16(subtype_);
-    renderer.writeName(server_, false);
-}
-
-/// \brief Compare two instances of \c AFSDB RDATA.
-///
-/// See documentation in \c Rdata.
-int
-AFSDB::compare(const Rdata& other) const {
-    const AFSDB& other_afsdb = dynamic_cast<const AFSDB&>(other);
-    if (subtype_ < other_afsdb.subtype_) {
-        return (-1);
-    } else if (subtype_ > other_afsdb.subtype_) {
-        return (1);
-    }
-
-    return (compareNames(server_, other_afsdb.server_));
-}
-
-const Name&
-AFSDB::getServer() const {
-    return (server_);
-}
-
-uint16_t
-AFSDB::getSubtype() const {
-    return (subtype_);
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/afsdb_18.h b/src/lib/dns/rdata/generic/afsdb_18.h
deleted file mode 100644
index 2fd8fbaa6d..0000000000
--- a/src/lib/dns/rdata/generic/afsdb_18.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <stdint.h>
-
-#include <string>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-/// \brief \c rdata::AFSDB class represents the AFSDB RDATA as defined %in
-/// RFC1183.
-///
-/// This class implements the basic interfaces inherited from the abstract
-/// \c rdata::Rdata class, and provides trivial accessors specific to the
-/// AFSDB RDATA.
-class AFSDB : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    /// \brief Assignment operator.
-    ///
-    /// This method never throws an exception.
-    AFSDB& operator=(const AFSDB& source);
-    ///
-    /// Specialized methods
-    ///
-
-    /// \brief Return the value of the server field.
-    ///
-    /// \return A reference to a \c Name class object corresponding to the
-    /// internal server name.
-    ///
-    /// This method never throws an exception.
-    const Name& getServer() const;
-
-    /// \brief Return the value of the subtype field.
-    ///
-    /// This method never throws an exception.
-    uint16_t getSubtype() const;
-
-private:
-    void createFromLexer(MasterLexer& lexer, const Name* origin);
-
-    uint16_t subtype_;
-    Name server_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/caa_257.cc b/src/lib/dns/rdata/generic/caa_257.cc
deleted file mode 100644
index 7f8b455687..0000000000
--- a/src/lib/dns/rdata/generic/caa_257.cc
+++ /dev/null
@@ -1,298 +0,0 @@
-// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
-
-#include <exceptions/exceptions.h>
-
-#include <util/buffer.h>
-#include <dns/name.h>
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-#include <dns/rdata/generic/detail/char_string.h>
-
-using namespace std;
-using boost::lexical_cast;
-using namespace isc::util;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-struct CAAImpl {
-    // straightforward representation of CAA RDATA fields
-    CAAImpl(uint8_t flags, const std::string& tag,
-            const detail::CharStringData& value) :
-        flags_(flags),
-        tag_(tag),
-        value_(value)
-    {
-        if ((sizeof(flags) + 1 + tag_.size() + value_.size()) > 65535) {
-            isc_throw(InvalidRdataLength,
-                      "CAA Value field is too large: " << value_.size());
-        }
-    }
-
-    uint8_t flags_;
-    const std::string tag_;
-    const detail::CharStringData value_;
-};
-
-// helper function for string and lexer constructors
-CAAImpl*
-CAA::constructFromLexer(MasterLexer& lexer) {
-    const uint32_t flags =
-        lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (flags > 255) {
-        isc_throw(InvalidRdataText,
-                  "CAA flags field out of range");
-    }
-
-    // Tag field must not be empty.
-    const std::string tag =
-        lexer.getNextToken(MasterToken::STRING).getString();
-    if (tag.empty()) {
-        isc_throw(InvalidRdataText, "CAA tag field is empty");
-    } else if (tag.size() > 255) {
-        isc_throw(InvalidRdataText,
-                  "CAA tag field is too large: " << tag.size());
-    }
-
-    // Value field may be empty.
-    detail::CharStringData value;
-    MasterToken token = lexer.getNextToken(MasterToken::QSTRING, true);
-    if ((token.getType() != MasterToken::END_OF_FILE) &&
-        (token.getType() != MasterToken::END_OF_LINE))
-    {
-        detail::stringToCharStringData(token.getStringRegion(), value);
-    }
-
-    return (new CAAImpl(flags, tag, value));
-}
-
-/// \brief Constructor from string.
-///
-/// The given string must represent a valid CAA RDATA.  There can be
-/// extra space characters at the beginning or end of the text (which
-/// are simply ignored), but other extra text, including a new line,
-/// will make the construction fail with an exception.
-///
-/// The Flags, Tag and Value fields must be within their valid ranges,
-/// but are not constrained to the values defined in RFC6844. The Tag
-/// field must not be empty.
-///
-/// \throw InvalidRdataText if any fields are missing, out of their
-/// valid ranges, incorrect, or empty.
-///
-/// \param caa_str A string containing the RDATA to be created
-CAA::CAA(const string& caa_str) :
-    impl_(NULL)
-{
-    // We use unique_ptr here because if there is an exception in this
-    // constructor, the destructor is not called and there could be a
-    // leak of the CAAImpl that constructFromLexer() returns.
-    std::unique_ptr<CAAImpl> impl_ptr;
-
-    try {
-        std::istringstream ss(caa_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        impl_ptr.reset(constructFromLexer(lexer));
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText, "extra input text for CAA: "
-                      << caa_str);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText, "Failed to construct CAA from '" <<
-                  caa_str << "': " << ex.what());
-    }
-
-    impl_ = impl_ptr.release();
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual
-/// representation of an CAA RDATA.
-///
-/// \throw MasterLexer::LexerError General parsing error such as missing
-/// field.
-/// \throw InvalidRdataText Fields are out of their valid ranges,
-/// incorrect, or empty.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-CAA::CAA(MasterLexer& lexer, const Name*,
-         MasterLoader::Options, MasterLoaderCallbacks&) :
-    impl_(constructFromLexer(lexer))
-{
-}
-
-/// \brief Constructor from InputBuffer.
-///
-/// The passed buffer must contain a valid CAA RDATA.
-///
-/// The Flags, Tag and Value fields must be within their valid ranges,
-/// but are not constrained to the values defined in RFC6844. The Tag
-/// field must not be empty.
-CAA::CAA(InputBuffer& buffer, size_t rdata_len) {
-    if (rdata_len < 2) {
-        isc_throw(InvalidRdataLength, "CAA record too short");
-    }
-
-    const uint8_t flags = buffer.readUint8();
-    const uint8_t tag_length = buffer.readUint8();
-    rdata_len -= 2;
-    if (tag_length == 0) {
-        isc_throw(InvalidRdataText, "CAA tag field is empty");
-    }
-
-    if (rdata_len < tag_length) {
-        isc_throw(InvalidRdataLength,
-                  "RDATA is too short for CAA tag field");
-    }
-
-    std::vector<uint8_t> tag_vec(tag_length);
-    buffer.readData(&tag_vec[0], tag_length);
-    std::string tag(tag_vec.begin(), tag_vec.end());
-    rdata_len -= tag_length;
-
-    detail::CharStringData value;
-    value.resize(rdata_len);
-    if (rdata_len > 0) {
-        buffer.readData(&value[0], rdata_len);
-    }
-
-    impl_ = new CAAImpl(flags, tag, value);
-}
-
-CAA::CAA(uint8_t flags, const std::string& tag, const std::string& value) :
-    impl_(NULL)
-{
-    if (tag.empty()) {
-        isc_throw(isc::InvalidParameter,
-                  "CAA tag field is empty");
-    } else if (tag.size() > 255) {
-        isc_throw(isc::InvalidParameter,
-                  "CAA tag field is too large: " << tag.size());
-    }
-
-    MasterToken::StringRegion region;
-    region.beg = &value[0]; // note std ensures this works even if str is empty
-    region.len = value.size();
-
-    detail::CharStringData value_vec;
-    detail::stringToCharStringData(region, value_vec);
-
-    impl_ = new CAAImpl(flags, tag, value_vec);
-}
-
-CAA::CAA(const CAA& other) :
-        Rdata(), impl_(new CAAImpl(*other.impl_))
-{}
-
-CAA&
-CAA::operator=(const CAA& source) {
-    if (this == &source) {
-        return (*this);
-    }
-
-    CAAImpl* newimpl = new CAAImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
-
-    return (*this);
-}
-
-CAA::~CAA() {
-    delete impl_;
-}
-
-void
-CAA::toWire(OutputBuffer& buffer) const {
-    buffer.writeUint8(impl_->flags_);
-
-    // The constructors must ensure that the tag field is not empty.
-    assert(!impl_->tag_.empty());
-    buffer.writeUint8(impl_->tag_.size());
-    buffer.writeData(&impl_->tag_[0], impl_->tag_.size());
-
-    if (!impl_->value_.empty()) {
-        buffer.writeData(&impl_->value_[0],
-                         impl_->value_.size());
-    }
-}
-
-void
-CAA::toWire(AbstractMessageRenderer& renderer) const {
-    renderer.writeUint8(impl_->flags_);
-
-    // The constructors must ensure that the tag field is not empty.
-    assert(!impl_->tag_.empty());
-    renderer.writeUint8(impl_->tag_.size());
-    renderer.writeData(&impl_->tag_[0], impl_->tag_.size());
-
-    if (!impl_->value_.empty()) {
-        renderer.writeData(&impl_->value_[0],
-                           impl_->value_.size());
-    }
-}
-
-std::string
-CAA::toText() const {
-    std::string result;
-
-    result = lexical_cast<std::string>(static_cast<int>(impl_->flags_));
-    result += " " + impl_->tag_;
-    result += " \"" + detail::charStringDataToString(impl_->value_) + "\"";
-
-    return (result);
-}
-
-int
-CAA::compare(const Rdata& other) const {
-    const CAA& other_caa = dynamic_cast<const CAA&>(other);
-
-    if (impl_->flags_ < other_caa.impl_->flags_) {
-        return (-1);
-    } else if (impl_->flags_ > other_caa.impl_->flags_) {
-        return (1);
-    }
-
-    // Do a case-insensitive compare of the tag strings.
-    const int result = boost::ilexicographical_compare
-        <std::string, std::string>(impl_->tag_, other_caa.impl_->tag_);
-    if (result != 0) {
-        return (result);
-    }
-
-    return (detail::compareCharStringDatas(impl_->value_,
-                                           other_caa.impl_->value_));
-}
-
-uint8_t
-CAA::getFlags() const {
-    return (impl_->flags_);
-}
-
-const std::string&
-CAA::getTag() const {
-    return (impl_->tag_);
-}
-
-const std::vector<uint8_t>&
-CAA::getValue() const {
-    return (impl_->value_);
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/caa_257.h b/src/lib/dns/rdata/generic/caa_257.h
deleted file mode 100644
index 0e81e71c54..0000000000
--- a/src/lib/dns/rdata/generic/caa_257.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <stdint.h>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-
-#include <string>
-#include <vector>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-struct CAAImpl;
-
-class CAA : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    CAA(uint8_t flags, const std::string& tag, const std::string& value);
-    CAA& operator=(const CAA& source);
-    ~CAA();
-
-    ///
-    /// Specialized methods
-    ///
-
-    /// \brief Return the Flags field of the CAA RDATA.
-    uint8_t getFlags() const;
-
-    /// \brief Return the Tag field of the CAA RDATA.
-    const std::string& getTag() const;
-
-    /// \brief Return the Value field of the CAA RDATA.
-    ///
-    /// Note: The const reference which is returned is valid only during
-    /// the lifetime of this \c generic::CAA object. It should not be
-    /// used afterwards.
-    const std::vector<uint8_t>& getValue() const;
-
-private:
-    CAAImpl* constructFromLexer(MasterLexer& lexer);
-
-    CAAImpl* impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/cname_5.cc b/src/lib/dns/rdata/generic/cname_5.cc
deleted file mode 100644
index 71cb4dc0c1..0000000000
--- a/src/lib/dns/rdata/generic/cname_5.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <string>
-
-#include <util/buffer.h>
-#include <dns/name.h>
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-#include <dns/rdata/generic/detail/lexer_util.h>
-
-using namespace std;
-using namespace isc::util;
-using isc::dns::rdata::generic::detail::createNameFromLexer;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-/// \brief Constructor from string.
-///
-/// The given string must represent a valid CNAME RDATA.  There can be extra
-/// space characters at the beginning or end of the text (which are simply
-/// ignored), but other extra text, including a new line, will make the
-/// construction fail with an exception.
-///
-/// The CNAME must be absolute since there's no parameter that specifies
-/// the origin name; if it is not absolute, \c MissingNameOrigin
-/// exception will be thrown.  These must not be represented as a quoted
-/// string.
-///
-/// \throw Others Exception from the Name and RRTTL constructors.
-/// \throw InvalidRdataText Other general syntax errors.
-CNAME::CNAME(const std::string& namestr) :
-    // Fill in dummy name and replace it soon below.
-    cname_(Name::ROOT_NAME())
-{
-    try {
-        std::istringstream ss(namestr);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        cname_ = createNameFromLexer(lexer, NULL);
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText, "extra input text for CNAME: "
-                      << namestr);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText, "Failed to construct CNAME from '" <<
-                  namestr << "': " << ex.what());
-    }
-}
-
-CNAME::CNAME(InputBuffer& buffer, size_t) :
-    Rdata(), cname_(buffer)
-{
-    // we don't need rdata_len for parsing.  if necessary, the caller will
-    // check consistency.
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual
-/// representation of a CNAME RDATA.  The CNAME field can be
-/// non-absolute if \c origin is non-NULL, in which case \c origin is
-/// used to make it absolute.  It must not be represented as a quoted
-/// string.
-///
-/// \throw MasterLexer::LexerError General parsing error such as missing field.
-/// \throw Other Exceptions from the Name and RRTTL constructors if
-/// construction of textual fields as these objects fail.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-/// \param origin If non NULL, specifies the origin of CNAME when it
-/// is non-absolute.
-CNAME::CNAME(MasterLexer& lexer, const Name* origin,
-             MasterLoader::Options, MasterLoaderCallbacks&) :
-    cname_(createNameFromLexer(lexer, origin))
-{}
-
-CNAME::CNAME(const CNAME& other) :
-    Rdata(), cname_(other.cname_)
-{}
-
-CNAME::CNAME(const Name& cname) :
-    cname_(cname)
-{}
-
-void
-CNAME::toWire(OutputBuffer& buffer) const {
-    cname_.toWire(buffer);
-}
-
-void
-CNAME::toWire(AbstractMessageRenderer& renderer) const {
-    renderer.writeName(cname_);
-}
-
-string
-CNAME::toText() const {
-    return (cname_.toText());
-}
-
-int
-CNAME::compare(const Rdata& other) const {
-    const CNAME& other_cname = dynamic_cast<const CNAME&>(other);
-
-    return (compareNames(cname_, other_cname.cname_));
-}
-
-const Name&
-CNAME::getCname() const {
-    return (cname_);
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/cname_5.h b/src/lib/dns/rdata/generic/cname_5.h
deleted file mode 100644
index 2149340709..0000000000
--- a/src/lib/dns/rdata/generic/cname_5.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <string>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-class CNAME : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    // CNAME specific methods
-    CNAME(const Name& cname);
-    const Name& getCname() const;
-private:
-    Name cname_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/detail/char_string.cc b/src/lib/dns/rdata/generic/detail/char_string.cc
deleted file mode 100644
index 1d150ed8e5..0000000000
--- a/src/lib/dns/rdata/generic/detail/char_string.cc
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <exceptions/exceptions.h>
-
-#include <dns/exceptions.h>
-#include <dns/rdata.h>
-#include <dns/master_lexer.h>
-#include <dns/rdata/generic/detail/char_string.h>
-#include <util/buffer.h>
-
-#include <boost/lexical_cast.hpp>
-
-#include <cassert>
-#include <cctype>
-#include <cstring>
-#include <vector>
-
-#include <stdint.h>
-
-namespace isc {
-namespace dns {
-namespace rdata {
-namespace generic {
-namespace detail {
-
-namespace {
-// Convert a DDD form to the corresponding integer
-int
-decimalToNumber(const char* s, const char* s_end) {
-    if (s_end - s < 3) {
-        isc_throw(InvalidRdataText, "Escaped digits too short");
-    }
-
-    const std::string num_str(s, s + 3);
-    try {
-        const int i = boost::lexical_cast<int>(num_str);
-        if (i > 255) {
-            isc_throw(InvalidRdataText, "Escaped digits too large: "
-                      << num_str);
-        }
-        return (i);
-    } catch (const boost::bad_lexical_cast&) {
-        isc_throw(InvalidRdataText,
-                  "Invalid form for escaped digits: " << num_str);
-    }
-}
-}
-
-void
-stringToCharString(const MasterToken::StringRegion& str_region,
-                   CharString& result)
-{
-    // make a space for the 1-byte length field; filled in at the end
-    result.push_back(0);
-
-    bool escape = false;
-    const char* s = str_region.beg;
-    const char* const s_end = str_region.beg + str_region.len;
-
-    for (size_t n = str_region.len; n != 0; --n, ++s) {
-        int c = (*s & 0xff);
-        if (escape && std::isdigit(c) != 0) {
-            c = decimalToNumber(s, s_end);
-            assert(n >= 3);
-            n -= 2;
-            s += 2;
-        } else if (!escape && c == '\\') {
-            escape = true;
-            continue;
-        }
-        escape = false;
-        result.push_back(c);
-    }
-    if (escape) {               // terminated by non-escaped '\'
-        isc_throw(InvalidRdataText, "character-string ends with '\\'");
-    }
-    if (result.size() > MAX_CHARSTRING_LEN + 1) { // '+ 1' due to the len field
-        isc_throw(CharStringTooLong, "character-string is too long: " <<
-                  (result.size() - 1) << "(+1) characters");
-    }
-    result[0] = result.size() - 1;
-}
-
-void
-stringToCharStringData(const MasterToken::StringRegion& str_region,
-                       CharStringData& result)
-{
-    bool escape = false;
-    const char* s = str_region.beg;
-    const char* const s_end = str_region.beg + str_region.len;
-
-    for (size_t n = str_region.len; n != 0; --n, ++s) {
-        int c = (*s & 0xff);
-        if (escape && std::isdigit(c) != 0) {
-            c = decimalToNumber(s, s_end);
-            // decimalToNumber() already throws if (s_end - s) is less
-            // than 3, so the following assertion is unnecessary. But we
-            // assert it anyway. 'n' is an unsigned type (size_t) and
-            // can underflow.
-            assert(n >= 3);
-            // 'n' and 's' are also updated by 1 in the for statement's
-            // expression, so we update them by 2 instead of 3 here.
-            n -= 2;
-            s += 2;
-        } else if (!escape && c == '\\') {
-            escape = true;
-            continue;
-        }
-        escape = false;
-        result.push_back(c);
-    }
-    if (escape) {               // terminated by non-escaped '\'
-        isc_throw(InvalidRdataText, "character-string ends with '\\'");
-    }
-}
-
-std::string
-charStringToString(const CharString& char_string) {
-    std::string s;
-    bool first = true;
-    for (auto const& it : char_string) {
-        if (first) {
-            first = false;
-            continue;
-        }
-        const uint8_t ch = it;
-        if ((ch < 0x20) || (ch >= 0x7f)) {
-            // convert to escaped \xxx (decimal) format
-            s.push_back('\\');
-            s.push_back('0' + ((ch / 100) % 10));
-            s.push_back('0' + ((ch / 10) % 10));
-            s.push_back('0' + (ch % 10));
-            continue;
-        }
-        if ((ch == '"') || (ch == ';') || (ch == '\\')) {
-            s.push_back('\\');
-        }
-        s.push_back(ch);
-    }
-
-    return (s);
-}
-
-std::string
-charStringDataToString(const CharStringData& char_string) {
-    std::string s;
-    for (auto const& it : char_string) {
-        const uint8_t ch = it;
-        if ((ch < 0x20) || (ch >= 0x7f)) {
-            // convert to escaped \xxx (decimal) format
-            s.push_back('\\');
-            s.push_back('0' + ((ch / 100) % 10));
-            s.push_back('0' + ((ch / 10) % 10));
-            s.push_back('0' + (ch % 10));
-            continue;
-        }
-        if ((ch == '"') || (ch == ';') || (ch == '\\')) {
-            s.push_back('\\');
-        }
-        s.push_back(ch);
-    }
-
-    return (s);
-}
-
-int compareCharStrings(const detail::CharString& self,
-                       const detail::CharString& other) {
-    if (self.size() == 0 && other.size() == 0) {
-        return (0);
-    }
-    if (self.size() == 0) {
-        return (-1);
-    }
-    if (other.size() == 0) {
-        return (1);
-    }
-    const size_t self_len = self[0];
-    const size_t other_len = other[0];
-    const size_t cmp_len = std::min(self_len, other_len);
-    if (cmp_len == 0) {
-        if (self_len < other_len) {
-            return (-1);
-        } else if (self_len > other_len) {
-            return (1);
-        } else {
-            return (0);
-        }
-    }
-    const int cmp = std::memcmp(&self[1], &other[1], cmp_len);
-    if (cmp < 0) {
-        return (-1);
-    } else if (cmp > 0) {
-        return (1);
-    } else if (self_len < other_len) {
-        return (-1);
-    } else if (self_len > other_len) {
-        return (1);
-    } else {
-        return (0);
-    }
-}
-
-int compareCharStringDatas(const detail::CharStringData& self,
-                           const detail::CharStringData& other) {
-    if (self.size() == 0 && other.size() == 0) {
-        return (0);
-    }
-    if (self.size() == 0) {
-        return (-1);
-    }
-    if (other.size() == 0) {
-        return (1);
-    }
-    const size_t self_len = self.size();
-    const size_t other_len = other.size();
-    const size_t cmp_len = std::min(self_len, other_len);
-    const int cmp = std::memcmp(&self[0], &other[0], cmp_len);
-    if (cmp < 0) {
-        return (-1);
-    } else if (cmp > 0) {
-        return (1);
-    } else if (self_len < other_len) {
-        return (-1);
-    } else if (self_len > other_len) {
-        return (1);
-    } else {
-        return (0);
-    }
-}
-
-size_t
-bufferToCharString(isc::util::InputBuffer& buffer, size_t rdata_len,
-                   CharString& target) {
-    if (rdata_len < 1 || buffer.getLength() - buffer.getPosition() < 1) {
-        isc_throw(isc::dns::DNSMessageFORMERR,
-                  "insufficient data to read character-string length");
-    }
-    const uint8_t len = buffer.readUint8();
-    if (rdata_len < len + 1) {
-        isc_throw(isc::dns::DNSMessageFORMERR,
-                  "character string length is too large: " <<
-                  static_cast<int>(len));
-    }
-    if (buffer.getLength() - buffer.getPosition() < len) {
-        isc_throw(isc::dns::DNSMessageFORMERR,
-                  "not enough data in buffer to read character-string of len"
-                  << static_cast<int>(len));
-    }
-
-    target.resize(len + 1);
-    target[0] = len;
-    buffer.readData(&target[0] + 1, len);
-
-    return (len + 1);
-}
-
-} // end of detail
-} // end of generic
-} // end of rdata
-} // end of dns
-} // end of isc
diff --git a/src/lib/dns/rdata/generic/detail/char_string.h b/src/lib/dns/rdata/generic/detail/char_string.h
deleted file mode 100644
index 2ad12fb400..0000000000
--- a/src/lib/dns/rdata/generic/detail/char_string.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef DNS_RDATA_CHARSTRING_H
-#define DNS_RDATA_CHARSTRING_H 1
-
-#include <dns/master_lexer.h>
-
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <stdint.h>
-
-namespace isc {
-namespace dns {
-namespace rdata {
-namespace generic {
-namespace detail {
-
-/// \brief Type for DNS character string.
-///
-/// A character string can contain any unsigned 8-bit value, so this cannot
-/// be the bare char basis.
-typedef std::vector<uint8_t> CharString;
-
-/// \brief Type for DNS character string without the length prefix.
-typedef std::vector<uint8_t> CharStringData;
-
-/// \brief Convert a DNS character-string into corresponding binary data.
-///
-/// This helper function takes a string object that is expected to be a
-/// textual representation of a valid DNS character-string, and dumps
-/// the corresponding binary sequence in the given placeholder (passed
-/// via the \c result parameter).  It handles escape notations of
-/// character-strings with a backslash ('\'), and checks the length
-/// restriction.
-///
-/// \throw CharStringTooLong The resulting binary data are too large for a
-/// valid character-string.
-/// \throw InvalidRdataText Other syntax errors.
-///
-/// \brief str_region A string that represents a character-string.
-/// \brief result A placeholder vector where the resulting data are to be
-/// stored.  Expected to be empty, but it's not checked.
-void stringToCharString(const MasterToken::StringRegion& str_region,
-                        CharString& result);
-
-/// \brief Convert a DNS character-string into corresponding binary data.
-///
-/// This method functions similar to \c stringToCharString() except it
-/// does not include the 1-octet length prefix in the \c result, and the
-/// result is not limited to MAX_CHARSTRING_LEN octets.
-///
-/// \throw InvalidRdataText Upon syntax errors.
-///
-/// \brief str_region A string that represents a character-string.
-/// \brief result A placeholder vector where the resulting data are to be
-/// stored.  Expected to be empty, but it's not checked.
-void stringToCharStringData(const MasterToken::StringRegion& str_region,
-                            CharStringData& result);
-
-/// \brief Convert a CharString into a textual DNS character-string.
-///
-/// This method converts a binary 8-bit representation of a DNS
-/// character string into a textual string representation, escaping any
-/// special characters in the process. For example, characters like
-/// double-quotes, semi-colon and backspace are prefixed with backspace
-/// character, and characters not in the printable range of [0x20, 0x7e]
-/// (inclusive) are converted to the \xxx 3-digit decimal
-/// representation.
-///
-/// \param char_string The \c CharString to convert.
-/// \return A string representation of \c char_string.
-std::string charStringToString(const CharString& char_string);
-
-/// \brief Convert a CharStringData into a textual DNS character-string.
-///
-/// Reverse of \c stringToCharStringData(). See \c stringToCharString()
-/// vs. \c stringToCharStringData().
-///
-/// \param char_string The \c CharStringData to convert.
-/// \return A string representation of \c char_string.
-std::string charStringDataToString(const CharStringData& char_string);
-
-/// \brief Compare two CharString objects
-///
-/// \param self The CharString field to compare
-/// \param other The CharString field to compare to
-///
-/// \return -1 if \c self would be sorted before \c other
-///          1 if \c self would be sorted after \c other
-///          0 if \c self and \c other are equal
-int compareCharStrings(const CharString& self, const CharString& other);
-
-/// \brief Compare two CharStringData objects
-///
-/// \param self The CharStringData field to compare
-/// \param other The CharStringData field to compare to
-///
-/// \return -1 if \c self would be sorted before \c other
-///          1 if \c self would be sorted after \c other
-///          0 if \c self and \c other are equal
-int compareCharStringDatas(const CharStringData& self,
-                           const CharStringData& other);
-
-/// \brief Convert a buffer containing a character-string to CharString
-///
-/// This method reads one character-string from the given buffer (in wire
-/// format) and places the result in the given \c CharString object.
-/// Since this is expected to be used in message parsing, the exception it
-/// raises is of that type.
-///
-/// On success, the buffer position is advanced to the end of the char-string,
-/// and the number of bytes read is returned.
-///
-/// \param buffer The buffer to read from.
-/// \param rdata_len The total size of the rr's rdata currently being read
-/// (used for integrity checks in the wire data)
-/// \param target The \c CharString where the result will be stored. Any
-/// existing data in the target will be overwritten.
-/// \throw DNSMessageFORMERR If the available data is not enough to read
-/// the character-string, or if the character-string length is out of bounds
-/// \return The number of bytes read
-size_t bufferToCharString(isc::util::InputBuffer& buffer, size_t rdata_len,
-                          CharString& target);
-
-
-} // namespace detail
-} // namespace generic
-} // namespace rdata
-} // namespace dns
-} // namespace isc
-#endif  // DNS_RDATA_CHARSTRING_H
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/detail/ds_like.h b/src/lib/dns/rdata/generic/detail/ds_like.h
deleted file mode 100644
index 4d8c2ea3e8..0000000000
--- a/src/lib/dns/rdata/generic/detail/ds_like.h
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef DS_LIKE_H
-#define DS_LIKE_H 1
-
-#include <stdint.h>
-
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include <boost/lexical_cast.hpp>
-
-#include <exceptions/exceptions.h>
-
-#include <dns/messagerenderer.h>
-#include <dns/name.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-namespace isc {
-namespace dns {
-namespace rdata {
-namespace generic {
-namespace detail {
-
-/// \brief \c rdata::DSLikeImpl class represents the DS-like RDATA for DS
-/// and DLV types.
-///
-/// This class implements the basic interfaces inherited by the DS and DLV
-/// classes from the abstract \c rdata::Rdata class, and provides trivial
-/// accessors to DS-like RDATA.
-template <class Type, uint16_t typeCode> class DSLikeImpl {
-    // Common sequence of toWire() operations used for the two versions of
-    // toWire().
-    template <typename Output>
-    void
-    toWireCommon(Output& output) const {
-        output.writeUint16(tag_);
-        output.writeUint8(algorithm_);
-        output.writeUint8(digest_type_);
-        output.writeData(&digest_[0], digest_.size());
-    }
-
-public:
-    /// \brief Constructor from string.
-    ///
-    /// The given string must represent a valid DS-like RDATA.  There
-    /// can be extra space characters at the beginning or end of the
-    /// text (which are simply ignored), but other extra text, including
-    /// a new line, will make the construction fail with an exception.
-    ///
-    /// The tag field must be a valid decimal representation of an
-    /// unsigned 16-bit integer. The protocol and algorithm fields must
-    /// be valid decimal representations of unsigned 8-bit integers
-    /// respectively. The digest field may contain whitespace.
-    ///
-    /// \throw InvalidRdataText if any fields are out of their valid range.
-    ///
-    /// \param ds_str A string containing the RDATA to be created
-    DSLikeImpl(const std::string& ds_str) {
-        try {
-            std::istringstream ss(ds_str);
-            MasterLexer lexer;
-            lexer.pushSource(ss);
-
-            constructFromLexer(lexer);
-
-            if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-                isc_throw(InvalidRdataText,
-                          "Extra input text for " << RRType(typeCode) << ": "
-                          << ds_str);
-            }
-        } catch (const MasterLexer::LexerError& ex) {
-            isc_throw(InvalidRdataText,
-                      "Failed to construct " << RRType(typeCode) << " from '" <<
-                      ds_str << "': " << ex.what());
-        }
-    }
-
-    /// \brief Constructor with a context of MasterLexer.
-    ///
-    /// The \c lexer should point to the beginning of valid textual
-    /// representation of a DS-like RDATA.
-    ///
-    /// The tag field must be a valid decimal representation of an
-    /// unsigned 16-bit integer. The protocol and algorithm fields must
-    /// be valid decimal representations of unsigned 8-bit integers
-    /// respectively.
-    ///
-    /// \throw MasterLexer::LexerError General parsing error such as
-    /// missing field.
-    /// \throw InvalidRdataText if any fields are out of their valid range.
-    ///
-    /// \param lexer A \c MasterLexer object parsing a master file for the
-    /// RDATA to be created
-    DSLikeImpl(MasterLexer& lexer, const Name*, MasterLoader::Options,
-               MasterLoaderCallbacks&)
-    {
-        constructFromLexer(lexer);
-    }
-
-private:
-    void constructFromLexer(MasterLexer& lexer) {
-        const uint32_t tag =
-            lexer.getNextToken(MasterToken::NUMBER).getNumber();
-        if (tag > 0xffff) {
-            isc_throw(InvalidRdataText,
-                      "Invalid " << RRType(typeCode) << " tag: " << tag);
-        }
-
-        const uint32_t algorithm =
-            lexer.getNextToken(MasterToken::NUMBER).getNumber();
-        if (algorithm > 0xff) {
-            isc_throw(InvalidRdataText,
-                      "Invalid " << RRType(typeCode) << " algorithm: "
-                      << algorithm);
-        }
-
-        const uint32_t digest_type =
-            lexer.getNextToken(MasterToken::NUMBER).getNumber();
-        if (digest_type > 0xff) {
-            isc_throw(InvalidRdataText,
-                      "Invalid " << RRType(typeCode) << " digest type: "
-                      << digest_type);
-        }
-
-        std::string digest;
-        while (true) {
-            const MasterToken& token = lexer.getNextToken();
-            if (token.getType() != MasterToken::STRING) {
-                break;
-            }
-            digest.append(token.getString());
-        }
-
-        lexer.ungetToken();
-
-        if (digest.size() == 0) {
-            isc_throw(InvalidRdataText,
-                      "Missing " << RRType(typeCode) << " digest");
-        }
-
-        tag_ = tag;
-        algorithm_ = algorithm;
-        digest_type_ = digest_type;
-        decodeHex(digest, digest_);
-    }
-
-public:
-    /// \brief Constructor from wire-format data.
-    ///
-    /// \param buffer A buffer storing the wire format data.
-    /// \param rdata_len The length of the RDATA in bytes, normally expected
-    /// to be the value of the RDLENGTH field of the corresponding RR.
-    ///
-    /// <b>Exceptions</b>
-    ///
-    /// \c InvalidRdataLength is thrown if the input data is too short for the
-    /// type.
-    DSLikeImpl(InputBuffer& buffer, size_t rdata_len) {
-        if (rdata_len < 4) {
-            isc_throw(InvalidRdataLength, RRType(typeCode) << " too short");
-        }
-
-        tag_ = buffer.readUint16();
-        algorithm_ = buffer.readUint8();
-        digest_type_ = buffer.readUint8();
-
-        rdata_len -= 4;
-        digest_.resize(rdata_len);
-        buffer.readData(&digest_[0], rdata_len);
-    }
-
-    /// \brief The copy constructor.
-    ///
-    /// Trivial for now, we could've used the default one.
-    DSLikeImpl(const DSLikeImpl& source) :
-        tag_(source.tag_),
-        algorithm_(source.algorithm_),
-        digest_type_(source.digest_type_),
-        digest_(source.digest_)
-    {}
-
-    /// \brief Convert the DS-like data to a string.
-    ///
-    /// \return A \c string object that represents the DS-like data.
-    std::string
-    toText() const {
-        using namespace boost;
-        return (lexical_cast<string>(static_cast<int>(tag_)) +
-            " " + lexical_cast<string>(static_cast<int>(algorithm_)) +
-            " " + lexical_cast<string>(static_cast<int>(digest_type_)) +
-            " " + encodeHex(digest_));
-    }
-
-    /// \brief Render the DS-like data in the wire format to an OutputBuffer
-    /// object.
-    ///
-    /// \param buffer An output buffer to store the wire data.
-    void
-    toWire(OutputBuffer& buffer) const {
-        toWireCommon(buffer);
-    }
-
-    /// \brief Render the DS-like data in the wire format to an
-    /// AbstractMessageRenderer object.
-    ///
-    /// \param renderer A renderer object to send the wire data to.
-    void
-    toWire(AbstractMessageRenderer& renderer) const {
-        toWireCommon(renderer);
-    }
-
-    /// \brief Compare two instances of DS-like RDATA.
-    ///
-    /// It is up to the caller to make sure that \c other is an object of the
-    /// same \c DSLikeImpl class.
-    ///
-    /// \param other the right-hand operand to compare against.
-    /// \return < 0 if \c this would be sorted before \c other.
-    /// \return 0 if \c this is identical to \c other in terms of sorting
-    /// order.
-    /// \return > 0 if \c this would be sorted after \c other.
-    int
-    compare(const DSLikeImpl& other_ds) const {
-        if (tag_ != other_ds.tag_) {
-            return (tag_ < other_ds.tag_ ? -1 : 1);
-        }
-        if (algorithm_ != other_ds.algorithm_) {
-            return (algorithm_ < other_ds.algorithm_ ? -1 : 1);
-        }
-        if (digest_type_ != other_ds.digest_type_) {
-            return (digest_type_ < other_ds.digest_type_ ? -1 : 1);
-        }
-
-        size_t this_len = digest_.size();
-        size_t other_len = other_ds.digest_.size();
-        size_t cmplen = min(this_len, other_len);
-        int cmp = memcmp(&digest_[0], &other_ds.digest_[0], cmplen);
-        if (cmp != 0) {
-            return (cmp);
-        } else {
-            return ((this_len == other_len)
-                    ? 0 : (this_len < other_len) ? -1 : 1);
-        }
-    }
-
-    /// \brief Accessors
-    uint16_t
-    getTag() const {
-        return (tag_);
-    }
-
-private:
-    // straightforward representation of DS RDATA fields
-    uint16_t tag_;
-    uint8_t algorithm_;
-    uint8_t digest_type_;
-    std::vector<uint8_t> digest_;
-};
-
-}
-}
-}
-}
-}
-#endif //  DS_LIKE_H
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/detail/lexer_util.h b/src/lib/dns/rdata/generic/detail/lexer_util.h
index 29b6c31c84..4e3d120c2a 100644
--- a/src/lib/dns/rdata/generic/detail/lexer_util.h
+++ b/src/lib/dns/rdata/generic/detail/lexer_util.h
@@ -5,7 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #ifndef DNS_RDATA_LEXER_UTIL_H
-#define DNS_RDATA_LEXER_UTIL_H 1
+#define DNS_RDATA_LEXER_UTIL_H
 
 #include <dns/name.h>
 #include <dns/master_lexer.h>
@@ -56,7 +56,3 @@ createNameFromLexer(MasterLexer& lexer, const Name* origin) {
 } // namespace dns
 } // namespace isc
 #endif  // DNS_RDATA_LEXER_UTIL_H
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/detail/nsec3param_common.cc b/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
deleted file mode 100644
index 6dada443a9..0000000000
--- a/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <exceptions/exceptions.h>
-
-#include <util/encode/encode.h>
-#include <util/buffer.h>
-
-#include <dns/exceptions.h>
-#include <dns/rdata.h>
-#include <dns/rdata/generic/detail/nsec3param_common.h>
-
-#include <boost/lexical_cast.hpp>
-
-#include <sstream>
-#include <vector>
-#include <stdint.h>
-
-using namespace std;
-using namespace isc::util;
-using namespace isc::util::encode;
-
-namespace isc {
-namespace dns {
-namespace rdata {
-namespace generic {
-namespace detail {
-namespace nsec3 {
-
-ParseNSEC3ParamResult
-parseNSEC3ParamFromLexer(const char* const rrtype_name,
-                         MasterLexer& lexer, vector<uint8_t>& salt)
-{
-    const uint32_t hashalg =
-        lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (hashalg > 0xff) {
-        isc_throw(InvalidRdataText, rrtype_name <<
-                  " hash algorithm out of range: " << hashalg);
-    }
-
-    const uint32_t flags =
-        lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (flags > 0xff) {
-        isc_throw(InvalidRdataText, rrtype_name << " flags out of range: " <<
-                  flags);
-    }
-
-    const uint32_t iterations =
-        lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (iterations > 0xffff) {
-        isc_throw(InvalidRdataText, rrtype_name <<
-                  " iterations out of range: " << iterations);
-    }
-
-    const string salthex =
-        lexer.getNextToken(MasterToken::STRING).getString();
-
-    // Salt is up to 255 bytes, and space is not allowed in the HEX encoding,
-    // so the encoded string cannot be longer than the double of max length
-    // of the actual salt.
-    if (salthex.size() > 255 * 2) {
-        isc_throw(InvalidRdataText, rrtype_name << " salt is too long: "
-                  << salthex.size() << " (encoded) bytes");
-    }
-    if (salthex != "-") {       // "-" means a 0-length salt
-        decodeHex(salthex, salt);
-    }
-
-    return (ParseNSEC3ParamResult(hashalg, flags, iterations));
-}
-
-ParseNSEC3ParamResult
-parseNSEC3ParamWire(const char* const rrtype_name,
-                    InputBuffer& buffer,
-                    size_t& rdata_len, std::vector<uint8_t>& salt)
-{
-    // NSEC3/NSEC3PARAM RR must have at least 5 octets:
-    // hash algorithm(1), flags(1), iteration(2), saltlen(1)
-    if (rdata_len < 5) {
-        isc_throw(DNSMessageFORMERR, rrtype_name << " too short, length: "
-                  << rdata_len);
-    }
-
-    const uint8_t hashalg = buffer.readUint8();
-    const uint8_t flags = buffer.readUint8();
-    const uint16_t iterations = buffer.readUint16();
-
-    const uint8_t saltlen = buffer.readUint8();
-    rdata_len -= 5;
-    if (rdata_len < saltlen) {
-        isc_throw(DNSMessageFORMERR, rrtype_name <<
-                  " salt length is too large: " <<
-                  static_cast<unsigned int>(saltlen));
-    }
-
-    salt.resize(saltlen);
-    if (saltlen > 0) {
-        buffer.readData(&salt[0], saltlen);
-        rdata_len -= saltlen;
-    }
-
-    return (ParseNSEC3ParamResult(hashalg, flags, iterations));
-}
-
-} // end of nsec3
-} // end of detail
-} // end of generic
-} // end of rdata
-} // end of dns
-} // end of isc
diff --git a/src/lib/dns/rdata/generic/detail/nsec3param_common.h b/src/lib/dns/rdata/generic/detail/nsec3param_common.h
deleted file mode 100644
index 89b2596c40..0000000000
--- a/src/lib/dns/rdata/generic/detail/nsec3param_common.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef NSEC3PARAM_COMMON_H
-#define NSEC3PARAM_COMMON_H 1
-
-#include <dns/master_lexer.h>
-
-#include <util/buffer.h>
-
-#include <stdint.h>
-#include <vector>
-
-namespace isc {
-namespace dns {
-namespace rdata {
-namespace generic {
-namespace detail {
-namespace nsec3 {
-
-/// \file
-///
-/// This helper module provides some utilities that handle NSEC3 and
-/// NSEC3PARAM RDATA.  They share the first few fields, and some operations
-/// on these fields are sufficiently complicated, so it would make sense to
-/// consolidate the processing logic into a single implementation module.
-///
-/// The functions defined here are essentially private and are only expected
-/// to be called from the \c NSEC3 and \c NSEC3PARAM class implementations.
-
-/// \brief Result values of the utilities.
-///
-/// This structure encapsulates a tuple of NSEC3/NSEC3PARAM algorithm,
-/// flags and iterations field values.  This is used as the return value
-/// of the utility functions defined in this module so the caller can
-/// use it for constructing the corresponding RDATA.
-struct ParseNSEC3ParamResult {
-    ParseNSEC3ParamResult(uint8_t param_algorithm, uint8_t param_flags,
-                          uint16_t param_iterations) :
-        algorithm(param_algorithm), flags(param_flags),
-        iterations(param_iterations)
-    {}
-    const uint8_t algorithm;
-    const uint8_t flags;
-    const uint16_t iterations;
-};
-
-/// \brief Convert textual representation of NSEC3 parameters.
-///
-/// This function takes an input MasterLexer that points at a complete
-/// textual representation of an NSEC3 or NSEC3PARAM RDATA and parses it
-/// extracting the hash algorithm, flags, iterations, and salt fields.
-///
-/// The first three fields are returned as the return value of this function.
-/// The salt will be stored in the given vector.  The vector is expected
-/// to be empty, but if not, the existing content will be overridden.
-///
-/// On successful return the given MasterLexer will reach the end of the
-/// salt field.
-///
-/// \exception isc::BadValue The salt is not a valid hex string.
-/// \exception InvalidRdataText The given RDATA is otherwise invalid for
-/// NSEC3 or NSEC3PARAM fields.
-/// \exception MasterLexer::LexerError There was a syntax error reading
-/// a field from the MasterLexer.
-///
-/// \param rrtype_name Either "NSEC3" or "NSEC3PARAM"; used as part of
-/// exception messages.
-/// \param lexer The MasterLexer to read NSEC3 parameter fields from.
-/// \param salt A placeholder for the salt field value of the RDATA.
-/// Expected to be empty, but it's not checked (and will be overridden).
-///
-/// \return The hash algorithm, flags, iterations in the form of
-/// ParseNSEC3ParamResult.
-ParseNSEC3ParamResult parseNSEC3ParamFromLexer(const char* const rrtype_name,
-                                               isc::dns::MasterLexer& lexer,
-                                               std::vector<uint8_t>& salt);
-
-/// \brief Extract NSEC3 parameters from wire-format data.
-///
-/// This function takes an input buffer that stores wire-format NSEC3 or
-/// NSEC3PARAM RDATA and parses it extracting the hash algorithm, flags,
-/// iterations, and salt fields.
-///
-/// The first three fields are returned as the return value of this function.
-/// The salt will be stored in the given vector.  The vector is expected
-/// to be empty, but if not, the existing content will be overridden.
-///
-/// On successful return the input buffer will point to the end of the
-/// salt field; rdata_len will be the length of the rest of RDATA
-/// (in the case of a valid NSEC3PARAM, it should be 0).
-///
-/// \exception DNSMessageFORMERR The wire data is invalid.
-///
-/// \param rrtype_name Either "NSEC3" or "NSEC3PARAM"; used as part of
-/// exception messages.
-/// \param buffer An input buffer that stores wire-format RDATA.  It must
-/// point to the beginning of the data.
-/// \param rdata_len The total length of the RDATA.
-/// \param salt A placeholder for the salt field value of the RDATA.
-/// Expected to be empty, but it's not checked (and will be overridden).
-///
-/// \return The hash algorithm, flags, iterations in the form of
-/// ParseNSEC3ParamResult.
-ParseNSEC3ParamResult parseNSEC3ParamWire(const char* const rrtype_name,
-                                          isc::util::InputBuffer& buffer,
-                                          size_t& rdata_len,
-                                          std::vector<uint8_t>& salt);
-}
-}
-}
-}
-}
-}
-
-#endif  // NSEC3PARAM_COMMON_H
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc b/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
deleted file mode 100644
index d02c11d04e..0000000000
--- a/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <exceptions/exceptions.h>
-
-#include <dns/exceptions.h>
-#include <dns/rdata.h>
-#include <dns/rrtype.h>
-
-#include <cassert>
-#include <sstream>
-#include <vector>
-#include <cstring>
-#include <stdint.h>
-
-using namespace std;
-
-namespace isc {
-namespace dns {
-namespace rdata {
-namespace generic {
-namespace detail {
-namespace nsec {
-void
-checkRRTypeBitmaps(const char* const rrtype_name,
-                   const vector<uint8_t>& typebits)
-{
-    bool first = true;
-    unsigned int lastblock = 0;
-    const size_t total_len = typebits.size();
-    size_t i = 0;
-
-    while (i < total_len) {
-        if (i + 2 > total_len) {
-            isc_throw(DNSMessageFORMERR, rrtype_name <<
-                      " RDATA from wire: incomplete bit map field");
-        }
-        const unsigned int block = typebits[i];
-        const size_t len = typebits[i + 1];
-        // Check that bitmap window blocks are in the correct order.
-        if (!first && block <= lastblock) {
-            isc_throw(DNSMessageFORMERR, rrtype_name <<
-                      " RDATA from wire: Disordered window blocks found: "
-                      << lastblock << " then " << block);
-        }
-        // Check for legal length
-        if (len < 1 || len > 32) {
-            isc_throw(DNSMessageFORMERR, rrtype_name <<
-                      " RDATA from wire: Invalid bitmap length: " << len);
-        }
-        // Check for overflow.
-        i += 2;
-        if (i + len > total_len) {
-            isc_throw(DNSMessageFORMERR, rrtype_name <<
-                      " RDATA from wire: bitmap length too large: " << len);
-        }
-        // The last octet of the bitmap must be non zero.
-        if (typebits[i + len - 1] == 0) {
-            isc_throw(DNSMessageFORMERR, rrtype_name <<
-                      " RDATA from wire: bitmap ending an all-zero byte");
-        }
-
-        i += len;
-        lastblock = block;
-        first = false;
-    }
-}
-
-void
-buildBitmapsFromLexer(const char* const rrtype_name,
-                      MasterLexer& lexer, vector<uint8_t>& typebits,
-                      bool allow_empty)
-{
-    uint8_t bitmap[8 * 1024];       // 64k bits
-    memset(bitmap, 0, sizeof(bitmap));
-
-    bool have_rrtypes = false;
-    std::string type_str;
-    while (true) {
-        const MasterToken& token =
-            lexer.getNextToken(MasterToken::STRING, true);
-        if ((token.getType() == MasterToken::END_OF_FILE) ||
-            (token.getType() == MasterToken::END_OF_LINE)) {
-            break;
-        }
-
-        // token is now assured to be of type STRING.
-
-        have_rrtypes = true;
-        token.getString(type_str);
-        try {
-            const int code = RRType(type_str).getCode();
-            bitmap[code / 8] |= (0x80 >> (code % 8));
-        } catch (const InvalidRRType&) {
-            isc_throw(InvalidRdataText, "Invalid RRtype in "
-                      << rrtype_name << " bitmap: " << type_str);
-        }
-    }
-
-    lexer.ungetToken();
-
-    if (!have_rrtypes) {
-         if (allow_empty) {
-              return;
-         }
-         isc_throw(InvalidRdataText,
-                   rrtype_name <<
-                   " record does not end with RR type mnemonic");
-    }
-
-    for (int window = 0; window < 256; ++window) {
-        int octet;
-        for (octet = 31; octet >= 0; octet--) {
-            if (bitmap[window * 32 + octet] != 0) {
-                break;
-            }
-        }
-        if (octet < 0) {
-            continue;
-        }
-        typebits.push_back(window);
-        typebits.push_back(octet + 1);
-        for (int i = 0; i <= octet; ++i) {
-            typebits.push_back(bitmap[window * 32 + i]);
-        }
-    }
-}
-
-void
-bitmapsToText(const vector<uint8_t>& typebits, ostringstream& oss) {
-    // In the following loop we use string::at() rather than operator[].
-    // Since the index calculation is a bit complicated, it will be safer
-    // and easier to find a bug (if any).  Note that this conversion method
-    // is generally not expected to be very efficient, so the slight overhead
-    // of at() should be acceptable.
-    const size_t typebits_len = typebits.size();
-    size_t len = 0;
-    for (size_t i = 0; i < typebits_len; i += len) {
-        assert(i + 2 <= typebits.size());
-        const unsigned int block = typebits.at(i);
-        len = typebits.at(i + 1);
-        assert(len > 0 && len <= 32);
-        i += 2;
-        for (size_t j = 0; j < len; ++j) {
-            if (typebits.at(i + j) == 0) {
-                continue;
-            }
-            for (size_t k = 0; k < 8; ++k) {
-                if ((typebits.at(i + j) & (0x80 >> k)) == 0) {
-                    continue;
-                }
-                const unsigned int t = block * 256 + j * 8 + k;
-                assert(t < 65536);
-                oss << " " << RRType(t);
-            }
-        }
-    }
-}
-}
-}
-}
-}
-}
-}
diff --git a/src/lib/dns/rdata/generic/detail/nsec_bitmap.h b/src/lib/dns/rdata/generic/detail/nsec_bitmap.h
deleted file mode 100644
index 4e073a08af..0000000000
--- a/src/lib/dns/rdata/generic/detail/nsec_bitmap.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef NSECBITMAP_H
-#define NSECBITMAP_H 1
-
-#include <dns/master_lexer.h>
-
-#include <stdint.h>
-
-#include <sstream>
-#include <vector>
-
-namespace isc {
-namespace dns {
-namespace rdata {
-namespace generic {
-namespace detail {
-namespace nsec {
-
-/// \file
-///
-/// This helper module provides some utilities that handle NSEC and NSEC3
-/// type bitmaps.  The format and processing of the type bitmaps are generally
-/// the same for these two RRs, so it would make sense to consolidate
-/// the processing logic into a single implementation module.
-///
-/// The functions defined here are essentially private and are only expected
-/// to be called from the \c NSEC and \c NSEC3 class implementations.
-
-/// \brief Check if a given "type bitmap" for NSEC/NSEC3 is valid.
-///
-/// This function checks given wire format data (stored in a
-/// \c std::vector) is a valid type bitmaps used for the NSEC and NSEC3 RRs
-/// according to RFC4034 and RFC5155.
-///
-/// \exception DNSMessageFORMERR The bitmap is not valid.
-///
-/// \param rrtype_name Either "NSEC" or "NSEC3"; used as part of exception
-/// messages.
-/// \param typebits The type bitmaps in wire format.  The size of vector
-/// is the total length of the bitmaps.
-void checkRRTypeBitmaps(const char* const rrtype_name,
-                        const std::vector<uint8_t>& typebits);
-
-/// \brief Convert textual sequence of RR types read from a lexer into
-/// type bitmaps.
-///
-/// See the other variant above for description. If \c allow_empty is
-/// true and there are no mnemonics, \c typebits is left untouched.
-///
-/// \exception InvalidRdataText Data read from the given lexer does not
-/// meet the assumption (e.g. including invalid form of RR type, not
-/// ending with an RR type string).
-///
-/// \param rrtype_name Either "NSEC" or "NSEC3"; used as part of exception
-/// messages.
-/// \param lexer MasterLexer that provides consists of a complete
-/// sequence of textual lexemes of RR types for which the corresponding
-/// bits are set.
-/// \param typebits A placeholder for the resulting bitmaps.  Expected to be
-/// empty, but it's not checked.
-/// \param allow_empty If true, the function simply returns if no RR
-/// type mnemonics are found. Otherwise, it throws an exception if no RR
-/// type mnemonics are found.
-void buildBitmapsFromLexer(const char* const rrtype_name,
-                           isc::dns::MasterLexer& lexer,
-                           std::vector<uint8_t>& typebits,
-                           bool allow_empty = false);
-
-/// \brief Convert type bitmaps to textual sequence of RR types.
-///
-/// This function converts wire-format data of type bitmaps for NSEC/NSEC3
-/// into a sequence of corresponding RR type strings, and inserts them
-/// into the given output stream with separating them by a single space
-/// character.
-///
-/// This function assumes the given bitmaps are valid in terms of RFC4034
-/// and RFC5155 (in practice, it assumes it's from a validly constructed
-/// NSEC or NSEC3 object); if it detects a format error, it aborts the
-/// program with assert().
-///
-/// \param typebits The type bitmaps in wire format.  The size of vector
-/// is the total length of the bitmaps.
-/// \param oss The output stream to which the converted RR type sequence
-/// are to be inserted.
-void bitmapsToText(const std::vector<uint8_t>& typebits,
-                   std::ostringstream& oss);
-}
-}
-}
-}
-}
-}
-
-#endif  // NSECBITMAP_H
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/detail/txt_like.h b/src/lib/dns/rdata/generic/detail/txt_like.h
deleted file mode 100644
index 5801b095e3..0000000000
--- a/src/lib/dns/rdata/generic/detail/txt_like.h
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright (C) 2011-2015,2021 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef TXT_LIKE_H
-#define TXT_LIKE_H 1
-
-#include <dns/master_lexer.h>
-#include <dns/rdata/generic/detail/char_string.h>
-
-#include <stdint.h>
-
-#include <string>
-#include <sstream>
-#include <vector>
-
-namespace isc {
-namespace dns {
-namespace rdata {
-namespace generic {
-namespace detail {
-
-/// \brief \c rdata::TXTLikeImpl class represents the TXT-like RDATA for TXT
-/// and SPF types.
-///
-/// This class implements the basic interfaces inherited by the TXT and SPF
-/// classes from the abstract \c rdata::Rdata class, and provides trivial
-/// accessors to TXT-like RDATA.
-template<class Type, uint16_t typeCode>class TXTLikeImpl {
-public:
-    /// \brief Constructor from wire-format data.
-    ///
-    /// \param buffer A buffer storing the wire format data.
-    /// \param rdata_len The length of the RDATA in bytes, normally expected
-    /// to be the value of the RDLENGTH field of the corresponding RR.
-    ///
-    /// <b>Exceptions</b>
-    ///
-    /// \c InvalidRdataLength is thrown if rdata_len exceeds the maximum.
-    /// \c DNSMessageFORMERR is thrown if the RR is malformed.
-    TXTLikeImpl(util::InputBuffer& buffer, size_t rdata_len) {
-        if (rdata_len > MAX_RDLENGTH) {
-            isc_throw(InvalidRdataLength, "RDLENGTH too large: " << rdata_len);
-        }
-
-        if (rdata_len == 0) {    // note that this couldn't happen in the loop.
-            isc_throw(DNSMessageFORMERR, "Error in parsing " <<
-                      RRType(typeCode) << " RDATA: 0-length character string");
-        }
-
-        do {
-            const uint8_t len = buffer.readUint8();
-            if (rdata_len < len + 1) {
-                isc_throw(DNSMessageFORMERR, "Error in parsing " <<
-                          RRType(typeCode) <<
-                          " RDATA: character string length is too large: " <<
-                          static_cast<int>(len));
-            }
-            std::vector<uint8_t> data(len + 1);
-            data[0] = len;
-            buffer.readData(&data[0] + 1, len);
-            string_list_.push_back(data);
-
-            rdata_len -= (len + 1);
-        } while (rdata_len > 0);
-    }
-
-    /// \brief Constructor from string.
-    ///
-    /// \throw CharStringTooLong the parameter string length exceeds maximum.
-    /// \throw InvalidRdataText the method cannot process the parameter data
-    explicit TXTLikeImpl(const std::string& txtstr) {
-        std::istringstream ss(txtstr);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        try {
-            buildFromTextHelper(lexer);
-            if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-                isc_throw(InvalidRdataText, "Failed to construct " <<
-                          RRType(typeCode) << " RDATA from '" << txtstr <<
-                          "': extra new line");
-            }
-        } catch (const MasterLexer::LexerError& ex) {
-            isc_throw(InvalidRdataText, "Failed to construct " <<
-                      RRType(typeCode) << " RDATA from '" << txtstr << "': "
-                      << ex.what());
-        }
-    }
-
-    /// \brief Constructor using the master lexer.
-    ///
-    /// \throw CharStringTooLong the parameter string length exceeds maximum.
-    /// \throw InvalidRdataText the method cannot process the parameter data
-    ///
-    /// \param lexer A \c MasterLexer object parsing a master file for this
-    /// RDATA.
-    TXTLikeImpl(MasterLexer& lexer) {
-        buildFromTextHelper(lexer);
-    }
-
-private:
-    void buildFromTextHelper(MasterLexer& lexer) {
-        while (true) {
-            const MasterToken& token = lexer.getNextToken(
-                MasterToken::QSTRING, true);
-            if (token.getType() != MasterToken::STRING &&
-                token.getType() != MasterToken::QSTRING) {
-                break;
-            }
-            string_list_.push_back(std::vector<uint8_t>());
-            stringToCharString(token.getStringRegion(), string_list_.back());
-        }
-
-        // Let upper layer handle eol/eof.
-        lexer.ungetToken();
-
-        if (string_list_.empty()) {
-            isc_throw(InvalidRdataText, "Failed to construct " <<
-                      RRType(typeCode) << " RDATA: empty input");
-        }
-    }
-
-public:
-    /// \brief The copy constructor.
-    ///
-    /// Trivial for now, we could've used the default one.
-    TXTLikeImpl(const TXTLikeImpl& other) :
-        string_list_(other.string_list_)
-    {}
-
-    /// \brief Render the TXT-like data in the wire format to an OutputBuffer
-    /// object.
-    ///
-    /// \param buffer An output buffer to store the wire data.
-    void
-    toWire(util::OutputBuffer& buffer) const {
-        for (std::vector<std::vector<uint8_t> >::const_iterator it =
-                 string_list_.begin();
-             it != string_list_.end();
-             ++it)
-        {
-            buffer.writeData(&(*it)[0], (*it).size());
-        }
-    }
-
-    /// \brief Render the TXT-like data in the wire format to an
-    /// AbstractMessageRenderer object.
-    ///
-    /// \param buffer An output AbstractMessageRenderer to send the wire data
-    /// to.
-    void
-    toWire(AbstractMessageRenderer& renderer) const {
-        for (std::vector<std::vector<uint8_t> >::const_iterator it =
-                 string_list_.begin();
-             it != string_list_.end();
-             ++it)
-        {
-            renderer.writeData(&(*it)[0], (*it).size());
-        }
-    }
-
-    /// \brief Convert the TXT-like data to a string.
-    ///
-    /// \return A \c string object that represents the TXT-like data.
-    std::string
-    toText() const {
-        std::string s;
-
-        for (std::vector<std::vector<uint8_t> >::const_iterator it =
-                 string_list_.begin(); it != string_list_.end(); ++it)
-        {
-            if (!s.empty()) {
-                s.push_back(' ');
-            }
-            s.push_back('"');
-            s.append(charStringToString(*it));
-            s.push_back('"');
-        }
-
-        return (s);
-    }
-
-    /// \brief Compare two instances of TXT-like RDATA.
-    ///
-    /// It is up to the caller to make sure that \c other is an object of the
-    /// same \c TXTLikeImpl class.
-    ///
-    /// \param other the right-hand operand to compare against.
-    /// \return < 0 if \c this would be sorted before \c other.
-    /// \return 0 if \c this is identical to \c other in terms of sorting
-    /// order.
-    /// \return > 0 if \c this would be sorted after \c other.
-    int
-    compare(const TXTLikeImpl& other) const {
-        // This implementation is not efficient.  Revisit this (TBD).
-        OutputBuffer this_buffer(0);
-        toWire(this_buffer);
-        uint8_t const* const this_data = (uint8_t const*)this_buffer.getData();
-        const size_t this_len = this_buffer.getLength();
-
-        OutputBuffer other_buffer(0);
-        other.toWire(other_buffer);
-        uint8_t const* const other_data
-                                      = (uint8_t const*)other_buffer.getData();
-        const size_t other_len = other_buffer.getLength();
-
-        const size_t cmplen = min(this_len, other_len);
-        const int cmp = memcmp(this_data, other_data, cmplen);
-
-        if (cmp != 0) {
-            return (cmp);
-        } else {
-            return ((this_len == other_len) ? 0 :
-                    (this_len < other_len) ? -1 : 1);
-        }
-    }
-
-private:
-    /// Note: this is a prototype version; we may reconsider
-    /// this representation later.
-    std::vector<std::vector<uint8_t> > string_list_;
-};
-
-}      // namespace detail
-}      // namespace generic
-}      // namespace rdata
-}      // namespace dns
-}      // namespace isc
-
-#endif //  TXT_LIKE_H
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/dlv_32769.cc b/src/lib/dns/rdata/generic/dlv_32769.cc
deleted file mode 100644
index 6170209806..0000000000
--- a/src/lib/dns/rdata/generic/dlv_32769.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <string>
-
-#include <util/buffer.h>
-#include <util/encode/encode.h>
-
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-#include <dns/rdata/generic/detail/ds_like.h>
-
-using namespace std;
-using namespace isc::util;
-using namespace isc::util::encode;
-using namespace isc::dns::rdata::generic::detail;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-/// \brief Constructor from string.
-///
-/// A copy of the implementation object is allocated and constructed.
-DLV::DLV(const std::string& ds_str) :
-    impl_(new DLVImpl(ds_str))
-{}
-
-/// \brief Constructor from wire-format data.
-///
-/// A copy of the implementation object is allocated and constructed.
-DLV::DLV(InputBuffer& buffer, size_t rdata_len) :
-    impl_(new DLVImpl(buffer, rdata_len))
-{}
-
-DLV::DLV(MasterLexer& lexer, const Name* origin, MasterLoader::Options options,
-         MasterLoaderCallbacks& callbacks) :
-    impl_(new DLVImpl(lexer, origin, options, callbacks))
-{}
-
-/// \brief Copy constructor
-///
-/// A copy of the implementation object is allocated and constructed.
-DLV::DLV(const DLV& source) :
-    Rdata(), impl_(new DLVImpl(*source.impl_))
-{}
-
-/// \brief Assignment operator
-///
-/// PIMPL-induced logic
-DLV&
-DLV::operator=(const DLV& source) {
-    if (this == &source) {
-        return (*this);
-    }
-
-    DLVImpl* newimpl = new DLVImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
-
-    return (*this);
-}
-
-/// \brief Destructor
-///
-/// Deallocates an internal resource.
-DLV::~DLV() {
-    delete impl_;
-}
-
-/// \brief Convert the \c DLV to a string.
-///
-/// A pass-thru to the corresponding implementation method.
-string
-DLV::toText() const {
-    return (impl_->toText());
-}
-
-/// \brief Render the \c DLV in the wire format to a OutputBuffer object
-///
-/// A pass-thru to the corresponding implementation method.
-void
-DLV::toWire(OutputBuffer& buffer) const {
-    impl_->toWire(buffer);
-}
-
-/// \brief Render the \c DLV in the wire format to a AbstractMessageRenderer
-/// object
-///
-/// A pass-thru to the corresponding implementation method.
-void
-DLV::toWire(AbstractMessageRenderer& renderer) const {
-    impl_->toWire(renderer);
-}
-
-/// \brief Compare two instances of \c DLV RDATA.
-///
-/// The type check is performed here. Otherwise, a pass-thru to the
-/// corresponding implementation method.
-int
-DLV::compare(const Rdata& other) const {
-    const DLV& other_ds = dynamic_cast<const DLV&>(other);
-
-    return (impl_->compare(*other_ds.impl_));
-}
-
-/// \brief Tag accessor
-uint16_t
-DLV::getTag() const {
-    return (impl_->getTag());
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/dlv_32769.h b/src/lib/dns/rdata/generic/dlv_32769.h
deleted file mode 100644
index 26523de6fe..0000000000
--- a/src/lib/dns/rdata/generic/dlv_32769.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <stdint.h>
-
-#include <string>
-
-#include <dns/name.h>
-#include <dns/rrtype.h>
-#include <dns/rrttl.h>
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-namespace detail {
-template <class Type, uint16_t typeCode> class DSLikeImpl;
-}
-
-/// \brief \c rdata::generic::DLV class represents the DLV RDATA as defined in
-/// RFC4431.
-///
-/// This class implements the basic interfaces inherited from the abstract
-/// \c rdata::Rdata class, and provides trivial accessors specific to the
-/// DLV RDATA.
-class DLV : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    /// \brief Assignment operator.
-    ///
-    /// It internally allocates a resource, and if it fails a corresponding
-    /// standard exception will be thrown.
-    /// This operator never throws an exception otherwise.
-    ///
-    /// This operator provides the strong exception guarantee: When an
-    /// exception is thrown the content of the assignment target will be
-    /// intact.
-    DLV& operator=(const DLV& source);
-
-    /// \brief The destructor.
-    ~DLV();
-
-    /// \brief Return the value of the Tag field.
-    ///
-    /// This method never throws an exception.
-    uint16_t getTag() const;
-private:
-    typedef detail::DSLikeImpl<DLV, 32769> DLVImpl;
-    DLVImpl* impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/dname_39.cc b/src/lib/dns/rdata/generic/dname_39.cc
deleted file mode 100644
index 9ee669baf6..0000000000
--- a/src/lib/dns/rdata/generic/dname_39.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <string>
-
-#include <util/buffer.h>
-#include <dns/name.h>
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-#include <dns/rdata/generic/detail/lexer_util.h>
-
-using namespace std;
-using namespace isc::util;
-using isc::dns::rdata::generic::detail::createNameFromLexer;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-/// \brief Constructor from string.
-///
-/// The given string must represent a valid DNAME RDATA.  There can be extra
-/// space characters at the beginning or end of the text (which are simply
-/// ignored), but other extra text, including a new line, will make the
-/// construction fail with an exception.
-///
-/// The TARGET must be absolute since there's no parameter that specifies
-/// the origin name; if it is not absolute, \c MissingNameOrigin
-/// exception will be thrown.  These must not be represented as a quoted
-/// string.
-///
-/// \throw Others Exception from the Name and RRTTL constructors.
-/// \throw InvalidRdataText Other general syntax errors.
-DNAME::DNAME(const std::string& namestr) :
-    // Fill in dummy name and replace it soon below.
-    dname_(Name::ROOT_NAME())
-{
-    try {
-        std::istringstream ss(namestr);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        dname_ = createNameFromLexer(lexer, NULL);
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText, "extra input text for DNAME: "
-                      << namestr);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText, "Failed to construct DNAME from '" <<
-                  namestr << "': " << ex.what());
-    }
-}
-
-DNAME::DNAME(InputBuffer& buffer, size_t) :
-    dname_(buffer)
-{
-    // we don't need rdata_len for parsing.  if necessary, the caller will
-    // check consistency.
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual
-/// representation of a DNAME RDATA.  The TARGET field can be
-/// non-absolute if \c origin is non-NULL, in which case \c origin is
-/// used to make it absolute.  It must not be represented as a quoted
-/// string.
-///
-/// \throw MasterLexer::LexerError General parsing error such as missing field.
-/// \throw Other Exceptions from the Name and RRTTL constructors if
-/// construction of textual fields as these objects fail.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-/// \param origin If non NULL, specifies the origin of TARGET when it
-/// is non-absolute.
-DNAME::DNAME(MasterLexer& lexer, const Name* origin,
-             MasterLoader::Options, MasterLoaderCallbacks&) :
-    dname_(createNameFromLexer(lexer, origin))
-{}
-
-DNAME::DNAME(const DNAME& other) :
-    Rdata(), dname_(other.dname_)
-{}
-
-DNAME::DNAME(const Name& dname) :
-    dname_(dname)
-{}
-
-void
-DNAME::toWire(OutputBuffer& buffer) const {
-    dname_.toWire(buffer);
-}
-
-void
-DNAME::toWire(AbstractMessageRenderer& renderer) const {
-    // Type DNAME is not "well-known", and name compression must be disabled
-    // per RFC3597.
-    renderer.writeName(dname_, false);
-}
-
-string
-DNAME::toText() const {
-    return (dname_.toText());
-}
-
-int
-DNAME::compare(const Rdata& other) const {
-    const DNAME& other_dname = dynamic_cast<const DNAME&>(other);
-
-    return (compareNames(dname_, other_dname.dname_));
-}
-
-const Name&
-DNAME::getDname() const {
-    return (dname_);
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/dname_39.h b/src/lib/dns/rdata/generic/dname_39.h
deleted file mode 100644
index 998fea0d5f..0000000000
--- a/src/lib/dns/rdata/generic/dname_39.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <string>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-class DNAME : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    // DNAME specific methods
-    DNAME(const Name& dname);
-    const Name& getDname() const;
-private:
-    Name dname_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/dnskey_48.cc b/src/lib/dns/rdata/generic/dnskey_48.cc
deleted file mode 100644
index ec7668b7cc..0000000000
--- a/src/lib/dns/rdata/generic/dnskey_48.cc
+++ /dev/null
@@ -1,315 +0,0 @@
-// Copyright (C) 2010-2024 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <iostream>
-#include <string>
-#include <sstream>
-#include <vector>
-
-#include <boost/lexical_cast.hpp>
-
-#include <util/encode/encode.h>
-#include <util/buffer.h>
-#include <dns/messagerenderer.h>
-#include <dns/name.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-#include <memory>
-
-#include <stdio.h>
-#include <time.h>
-
-using namespace std;
-using namespace isc::util;
-using namespace isc::util::encode;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-struct DNSKEYImpl {
-    // straightforward representation of DNSKEY RDATA fields
-    DNSKEYImpl(uint16_t flags, uint8_t protocol, uint8_t algorithm,
-               const vector<uint8_t>& keydata) :
-        flags_(flags), protocol_(protocol), algorithm_(algorithm),
-        keydata_(keydata)
-    {}
-
-    uint16_t flags_;
-    uint8_t protocol_;
-    uint8_t algorithm_;
-    const vector<uint8_t> keydata_;
-};
-
-/// \brief Constructor from string.
-///
-/// The given string must represent a valid DNSKEY RDATA.  There can be
-/// extra space characters at the beginning or end of the text (which
-/// are simply ignored), but other extra text, including a new line,
-/// will make the construction fail with an exception.
-///
-/// The Protocol and Algorithm fields must be within their valid
-/// ranges. The Public Key field must be present and must contain a
-/// Base64 encoding of the public key. Whitespace is allowed within the
-/// Base64 text.
-///
-/// It is okay for the key data to be missing.  Note: BIND 9 also accepts
-/// DNSKEY missing key data.  While the RFC is silent in this case, and it
-/// may be debatable what an implementation should do, but since this field
-/// is algorithm dependent and this implementations doesn't reject unknown
-/// algorithms, it's lenient here.
-///
-/// \throw InvalidRdataText if any fields are out of their valid range,
-/// or are incorrect.
-///
-/// \param dnskey_str A string containing the RDATA to be created
-DNSKEY::DNSKEY(const std::string& dnskey_str) :
-    impl_(NULL)
-{
-    // We use unique_ptr here because if there is an exception in this
-    // constructor, the destructor is not called and there could be a
-    // leak of the DNSKEYImpl that constructFromLexer() returns.
-    std::unique_ptr<DNSKEYImpl> impl_ptr;
-
-    try {
-        std::istringstream ss(dnskey_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        impl_ptr.reset(constructFromLexer(lexer));
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText,
-                      "Extra input text for DNSKEY: " << dnskey_str);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText,
-                  "Failed to construct DNSKEY from '" << dnskey_str << "': "
-                  << ex.what());
-    }
-
-    impl_ = impl_ptr.release();
-}
-
-/// \brief Constructor from InputBuffer.
-///
-/// The passed buffer must contain a valid DNSKEY RDATA.
-///
-/// The Protocol and Algorithm fields are not checked for unknown
-/// values.  It is okay for the key data to be missing (see the description
-/// of the constructor from string).
-DNSKEY::DNSKEY(InputBuffer& buffer, size_t rdata_len) :
-    impl_(NULL)
-{
-    if (rdata_len < 4) {
-        isc_throw(InvalidRdataLength, "DNSKEY too short: " << rdata_len);
-    }
-
-    const uint16_t flags = buffer.readUint16();
-    const uint16_t protocol = buffer.readUint8();
-    const uint16_t algorithm = buffer.readUint8();
-
-    rdata_len -= 4;
-
-    vector<uint8_t> keydata;
-    // If key data is missing, it's OK. See the API documentation of the
-    // constructor.
-    if (rdata_len > 0) {
-        keydata.resize(rdata_len);
-        buffer.readData(&keydata[0], rdata_len);
-    }
-
-    impl_ = new DNSKEYImpl(flags, protocol, algorithm, keydata);
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual
-/// representation of an DNSKEY RDATA.
-///
-/// See \c DNSKEY::DNSKEY(const std::string&) for description of the
-/// expected RDATA fields.
-///
-/// \throw MasterLexer::LexerError General parsing error such as
-/// missing field.
-/// \throw InvalidRdataText if any fields are out of their valid range,
-/// or are incorrect.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-DNSKEY::DNSKEY(MasterLexer& lexer, const Name*,
-               MasterLoader::Options, MasterLoaderCallbacks&) :
-    impl_(NULL)
-{
-    impl_ = constructFromLexer(lexer);
-}
-
-DNSKEYImpl*
-DNSKEY::constructFromLexer(MasterLexer& lexer) {
-    const uint32_t flags = lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (flags > 0xffff) {
-        isc_throw(InvalidRdataText,
-                  "DNSKEY flags out of range: " << flags);
-    }
-
-    const uint32_t protocol =
-        lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (protocol > 0xff) {
-        isc_throw(InvalidRdataText,
-                  "DNSKEY protocol out of range: " << protocol);
-    }
-
-    const uint32_t algorithm =
-        lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (algorithm > 0xff) {
-        isc_throw(InvalidRdataText,
-                  "DNSKEY algorithm out of range: " << algorithm);
-    }
-
-    std::string keydata_str;
-    std::string keydata_substr;
-    while (true) {
-        const MasterToken& token =
-            lexer.getNextToken(MasterToken::STRING, true);
-        if ((token.getType() == MasterToken::END_OF_FILE) ||
-            (token.getType() == MasterToken::END_OF_LINE)) {
-            break;
-        }
-
-        // token is now assured to be of type STRING.
-
-        token.getString(keydata_substr);
-        keydata_str.append(keydata_substr);
-    }
-
-    lexer.ungetToken();
-
-    vector<uint8_t> keydata;
-    // If key data is missing, it's OK. See the API documentation of the
-    // constructor.
-    if (keydata_str.size() > 0) {
-        decodeBase64(keydata_str, keydata);
-    }
-
-    return (new DNSKEYImpl(flags, protocol, algorithm, keydata));
-}
-
-DNSKEY::DNSKEY(const DNSKEY& source) :
-    Rdata(), impl_(new DNSKEYImpl(*source.impl_))
-{}
-
-DNSKEY&
-DNSKEY::operator=(const DNSKEY& source) {
-    if (this == &source) {
-        return (*this);
-    }
-
-    DNSKEYImpl* newimpl = new DNSKEYImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
-
-    return (*this);
-}
-
-DNSKEY::~DNSKEY() {
-    delete impl_;
-}
-
-string
-DNSKEY::toText() const {
-    return (boost::lexical_cast<string>(static_cast<int>(impl_->flags_)) +
-        " " + boost::lexical_cast<string>(static_cast<int>(impl_->protocol_)) +
-        " " + boost::lexical_cast<string>(static_cast<int>(impl_->algorithm_)) +
-        " " + encodeBase64(impl_->keydata_));
-}
-
-void
-DNSKEY::toWire(OutputBuffer& buffer) const {
-    buffer.writeUint16(impl_->flags_);
-    buffer.writeUint8(impl_->protocol_);
-    buffer.writeUint8(impl_->algorithm_);
-    buffer.writeData(&impl_->keydata_[0], impl_->keydata_.size());
-}
-
-void
-DNSKEY::toWire(AbstractMessageRenderer& renderer) const {
-    renderer.writeUint16(impl_->flags_);
-    renderer.writeUint8(impl_->protocol_);
-    renderer.writeUint8(impl_->algorithm_);
-    renderer.writeData(&impl_->keydata_[0], impl_->keydata_.size());
-}
-
-int
-DNSKEY::compare(const Rdata& other) const {
-    const DNSKEY& other_dnskey = dynamic_cast<const DNSKEY&>(other);
-
-    if (impl_->flags_ != other_dnskey.impl_->flags_) {
-        return (impl_->flags_ < other_dnskey.impl_->flags_ ? -1 : 1);
-    }
-    if (impl_->protocol_ != other_dnskey.impl_->protocol_) {
-        return (impl_->protocol_ < other_dnskey.impl_->protocol_ ? -1 : 1);
-    }
-    if (impl_->algorithm_ != other_dnskey.impl_->algorithm_) {
-        return (impl_->algorithm_ < other_dnskey.impl_->algorithm_ ? -1 : 1);
-    }
-
-    const size_t this_len = impl_->keydata_.size();
-    const size_t other_len = other_dnskey.impl_->keydata_.size();
-    const size_t cmplen = min(this_len, other_len);
-    if (cmplen == 0) {
-        return ((this_len == other_len) ? 0 : (this_len < other_len) ? -1 : 1);
-    }
-    const int cmp = memcmp(&impl_->keydata_[0],
-                           &other_dnskey.impl_->keydata_[0], cmplen);
-    if (cmp != 0) {
-        return (cmp);
-    } else {
-        return ((this_len == other_len) ? 0 : (this_len < other_len) ? -1 : 1);
-    }
-}
-
-uint16_t
-DNSKEY::getTag() const {
-    if (impl_->algorithm_ == 1) {
-        // See RFC 4034 appendix B.1 for why the key data must contain
-        // at least 4 bytes with RSA/MD5: 3 trailing bytes to extract
-        // the tag from, and 1 byte of exponent length subfield before
-        // modulus.
-        const int len = impl_->keydata_.size();
-        if (len < 4) {
-            isc_throw(isc::OutOfRange,
-                      "DNSKEY keydata too short for tag extraction");
-        }
-
-        return ((impl_->keydata_[len - 3] << 8) + impl_->keydata_[len - 2]);
-    }
-
-    uint32_t ac = impl_->flags_;
-    ac += (impl_->protocol_ << 8);
-    ac += impl_->algorithm_;
-
-    const size_t size = impl_->keydata_.size();
-    for (size_t i = 0; i < size; i ++) {
-        ac += (i & 1) ? impl_->keydata_[i] : (impl_->keydata_[i] << 8);
-    }
-    ac += (ac >> 16) & 0xffff;
-    return (ac & 0xffff);
-}
-
-uint16_t
-DNSKEY::getFlags() const {
-    return (impl_->flags_);
-}
-
-uint8_t
-DNSKEY::getAlgorithm() const {
-    return (impl_->algorithm_);
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/dnskey_48.h b/src/lib/dns/rdata/generic/dnskey_48.h
deleted file mode 100644
index a5e9efa43f..0000000000
--- a/src/lib/dns/rdata/generic/dnskey_48.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <stdint.h>
-
-#include <string>
-
-#include <dns/name.h>
-#include <dns/rrtype.h>
-#include <dns/rrttl.h>
-#include <dns/rdata.h>
-#include <dns/master_lexer.h>
-
-// BEGIN_HEADER_GUARD
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-struct DNSKEYImpl;
-
-class DNSKEY : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-    DNSKEY& operator=(const DNSKEY& source);
-    ~DNSKEY();
-
-    ///
-    /// Specialized methods
-    ///
-
-    /// \brief Returns the key tag
-    ///
-    /// \throw isc::OutOfRange if the key data for RSA/MD5 is too short
-    /// to support tag extraction.
-    uint16_t getTag() const;
-
-    uint16_t getFlags() const;
-    uint8_t getAlgorithm() const;
-
-private:
-    DNSKEYImpl* constructFromLexer(isc::dns::MasterLexer& lexer);
-
-    DNSKEYImpl* impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/ds_43.cc b/src/lib/dns/rdata/generic/ds_43.cc
deleted file mode 100644
index 80a6a6c119..0000000000
--- a/src/lib/dns/rdata/generic/ds_43.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (C) 2011-2024 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <string>
-
-#include <util/buffer.h>
-#include <util/encode/encode.h>
-
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-#include <dns/rdata/generic/detail/ds_like.h>
-
-using namespace std;
-using namespace isc::util;
-using namespace isc::util::encode;
-using namespace isc::dns::rdata::generic::detail;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-DS::DS(const std::string& ds_str) :
-    impl_(new DSImpl(ds_str))
-{}
-
-DS::DS(InputBuffer& buffer, size_t rdata_len) :
-    impl_(new DSImpl(buffer, rdata_len))
-{}
-
-DS::DS(MasterLexer& lexer, const Name* origin, MasterLoader::Options options,
-       MasterLoaderCallbacks& callbacks) :
-    impl_(new DSImpl(lexer, origin, options, callbacks))
-{}
-
-DS::DS(const DS& source) :
-    Rdata(), impl_(new DSImpl(*source.impl_))
-{}
-
-DS&
-DS::operator=(const DS& source) {
-    if (this == &source) {
-        return (*this);
-    }
-
-    DSImpl* newimpl = new DSImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
-
-    return (*this);
-}
-
-DS::~DS() {
-    delete impl_;
-}
-
-string
-DS::toText() const {
-    return (impl_->toText());
-}
-
-void
-DS::toWire(OutputBuffer& buffer) const {
-    impl_->toWire(buffer);
-}
-
-void
-DS::toWire(AbstractMessageRenderer& renderer) const {
-    impl_->toWire(renderer);
-}
-
-int
-DS::compare(const Rdata& other) const {
-    const DS& other_ds = dynamic_cast<const DS&>(other);
-
-    return (impl_->compare(*other_ds.impl_));
-}
-
-uint16_t
-DS::getTag() const {
-    return (impl_->getTag());
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/ds_43.h b/src/lib/dns/rdata/generic/ds_43.h
deleted file mode 100644
index a20e349ef6..0000000000
--- a/src/lib/dns/rdata/generic/ds_43.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <stdint.h>
-
-#include <string>
-
-#include <dns/name.h>
-#include <dns/rrtype.h>
-#include <dns/rrttl.h>
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-namespace detail {
-template <class Type, uint16_t typeCode> class DSLikeImpl;
-}
-
-/// \brief \c rdata::generic::DS class represents the DS RDATA as defined in
-/// RFC3658.
-///
-/// This class implements the basic interfaces inherited from the abstract
-/// \c rdata::Rdata class, and provides trivial accessors specific to the
-/// DS RDATA.
-class DS : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    /// \brief Assignment operator.
-    ///
-    /// It internally allocates a resource, and if it fails a corresponding
-    /// standard exception will be thrown.
-    /// This operator never throws an exception otherwise.
-    ///
-    /// This operator provides the strong exception guarantee: When an
-    /// exception is thrown the content of the assignment target will be
-    /// intact.
-    DS& operator=(const DS& source);
-
-    /// \brief The destructor.
-    ~DS();
-
-    /// \brief Return the value of the Tag field.
-    ///
-    /// This method never throws an exception.
-    uint16_t getTag() const;
-private:
-    typedef detail::DSLikeImpl<DS, 43> DSImpl;
-    DSImpl* impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/hinfo_13.cc b/src/lib/dns/rdata/generic/hinfo_13.cc
deleted file mode 100644
index 3bda21979c..0000000000
--- a/src/lib/dns/rdata/generic/hinfo_13.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <exceptions/exceptions.h>
-#include <dns/exceptions.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-#include <dns/rdata/generic/detail/char_string.h>
-#include <util/buffer.h>
-
-using namespace std;
-using namespace isc::util;
-using namespace isc::dns;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-class HINFOImpl {
-public:
-    HINFOImpl(const std::string& hinfo_str) {
-        std::istringstream ss(hinfo_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        try {
-            parseHINFOData(lexer);
-            // Should be at end of data now
-            if (lexer.getNextToken(MasterToken::QSTRING, true).getType() !=
-                MasterToken::END_OF_FILE) {
-                isc_throw(InvalidRdataText,
-                          "Invalid HINFO text format: too many fields.");
-            }
-        } catch (const MasterLexer::LexerError& ex) {
-            isc_throw(InvalidRdataText, "Failed to construct HINFO RDATA from "
-                                        << hinfo_str << "': " << ex.what());
-        }
-    }
-
-    HINFOImpl(InputBuffer& buffer, size_t rdata_len) {
-        rdata_len -= detail::bufferToCharString(buffer, rdata_len, cpu);
-        rdata_len -= detail::bufferToCharString(buffer, rdata_len, os);
-        if (rdata_len != 0) {
-            isc_throw(isc::dns::DNSMessageFORMERR, "Error in parsing " <<
-                      "HINFO RDATA: bytes left at end: " <<
-                      static_cast<int>(rdata_len));
-        }
-    }
-
-    HINFOImpl(MasterLexer& lexer)
-    {
-        parseHINFOData(lexer);
-    }
-
-private:
-    void
-    parseHINFOData(MasterLexer& lexer) {
-        MasterToken token = lexer.getNextToken(MasterToken::QSTRING);
-        stringToCharString(token.getStringRegion(), cpu);
-        token = lexer.getNextToken(MasterToken::QSTRING);
-        stringToCharString(token.getStringRegion(), os);
-    }
-
-public:
-    detail::CharString cpu;
-    detail::CharString os;
-};
-
-HINFO::HINFO(const std::string& hinfo_str) : impl_(new HINFOImpl(hinfo_str))
-{}
-
-
-HINFO::HINFO(InputBuffer& buffer, size_t rdata_len) :
-    impl_(new HINFOImpl(buffer, rdata_len))
-{}
-
-HINFO::HINFO(const HINFO& source):
-    Rdata(), impl_(new HINFOImpl(*source.impl_))
-{
-}
-
-HINFO::HINFO(MasterLexer& lexer, const Name*,
-             MasterLoader::Options, MasterLoaderCallbacks&) :
-    impl_(new HINFOImpl(lexer))
-{}
-
-HINFO&
-HINFO::operator=(const HINFO& source)
-{
-    impl_.reset(new HINFOImpl(*source.impl_));
-    return (*this);
-}
-
-HINFO::~HINFO() {
-}
-
-std::string
-HINFO::toText() const {
-    string result;
-    result += "\"";
-    result += detail::charStringToString(impl_->cpu);
-    result += "\" \"";
-    result += detail::charStringToString(impl_->os);
-    result += "\"";
-    return (result);
-}
-
-void
-HINFO::toWire(OutputBuffer& buffer) const {
-    toWireHelper(buffer);
-}
-
-void
-HINFO::toWire(AbstractMessageRenderer& renderer) const {
-    toWireHelper(renderer);
-}
-
-int
-HINFO::compare(const Rdata& other) const {
-    const HINFO& other_hinfo = dynamic_cast<const HINFO&>(other);
-
-    const int cmp = compareCharStrings(impl_->cpu, other_hinfo.impl_->cpu);
-    if (cmp != 0) {
-        return (cmp);
-    }
-    return (compareCharStrings(impl_->os, other_hinfo.impl_->os));
-}
-
-const std::string
-HINFO::getCPU() const {
-    return (detail::charStringToString(impl_->cpu));
-}
-
-const std::string
-HINFO::getOS() const {
-    return (detail::charStringToString(impl_->os));
-}
-
-template <typename T>
-void
-HINFO::toWireHelper(T& outputer) const {
-    outputer.writeData(&impl_->cpu[0], impl_->cpu.size());
-    outputer.writeData(&impl_->os[0], impl_->os.size());
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/hinfo_13.h b/src/lib/dns/rdata/generic/hinfo_13.h
deleted file mode 100644
index acceb14fdb..0000000000
--- a/src/lib/dns/rdata/generic/hinfo_13.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-#include <stdint.h>
-
-#include <string>
-
-#include <boost/scoped_ptr.hpp>
-#include <boost/noncopyable.hpp>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-#include <util/buffer.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-class HINFOImpl;
-
-/// \brief \c HINFO class represents the HINFO rdata defined in
-/// RFC1034, RFC1035
-///
-/// This class implements the basic interfaces inherited from the
-/// \c rdata::Rdata class, and provides accessors specific to the
-/// HINFO rdata.
-class HINFO : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    // HINFO specific methods
-    ~HINFO();
-
-    HINFO& operator=(const HINFO&);
-
-    const std::string getCPU() const;
-    const std::string getOS() const;
-
-private:
-    /// Helper template function for toWire()
-    ///
-    /// \param outputer Where to write data in
-    template <typename T>
-    void toWireHelper(T& outputer) const;
-
-    boost::scoped_ptr<HINFOImpl> impl_;
-};
-
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/minfo_14.cc b/src/lib/dns/rdata/generic/minfo_14.cc
deleted file mode 100644
index d3dfd1e630..0000000000
--- a/src/lib/dns/rdata/generic/minfo_14.cc
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <string>
-#include <sstream>
-
-#include <util/buffer.h>
-
-#include <dns/messagerenderer.h>
-#include <dns/name.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-#include <dns/rdata/generic/detail/lexer_util.h>
-
-using namespace std;
-using namespace isc::dns;
-using namespace isc::util;
-using isc::dns::rdata::generic::detail::createNameFromLexer;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-/// \brief Constructor from string.
-///
-/// \c minfo_str must be formatted as follows:
-/// \code <rmailbox name> <emailbox name>
-/// \endcode
-/// where both fields must represent a valid domain name.
-///
-/// An example of valid string is:
-/// \code "rmail.example.com. email.example.com." \endcode
-///
-/// \throw InvalidRdataText The number of RDATA fields (must be 2) is
-/// incorrect.
-/// \throw std::bad_alloc Memory allocation for names fails.
-/// \throw Other The constructor of the \c Name class will throw if the
-/// names in the string is invalid.
-MINFO::MINFO(const std::string& minfo_str) :
-    // We cannot construct both names in the initialization list due to the
-    // necessary text processing, so we have to initialize them with a dummy
-    // name and replace them later.
-    rmailbox_(Name::ROOT_NAME()), emailbox_(Name::ROOT_NAME())
-{
-    try {
-        std::istringstream ss(minfo_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        rmailbox_ = createNameFromLexer(lexer, NULL);
-        emailbox_ = createNameFromLexer(lexer, NULL);
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText, "extra input text for MINFO: "
-                      << minfo_str);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText, "Failed to construct MINFO from '" <<
-                  minfo_str << "': " << ex.what());
-    }
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual representation
-/// of an MINFO RDATA.  The RMAILBOX and EMAILBOX fields can be non-absolute
-/// if \c origin is non-NULL, in which case \c origin is used to make them
-/// absolute.
-///
-/// \throw MasterLexer::LexerError General parsing error such as missing field.
-/// \throw Other Exceptions from the Name and constructors if construction of
-/// textual fields as these objects fail.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-/// \param origin If non NULL, specifies the origin of SERVER when it
-/// is non-absolute.
-MINFO::MINFO(MasterLexer& lexer, const Name* origin,
-             MasterLoader::Options, MasterLoaderCallbacks&) :
-    rmailbox_(createNameFromLexer(lexer, origin)),
-    emailbox_(createNameFromLexer(lexer, origin))
-{
-}
-
-/// \brief Constructor from wire-format data.
-///
-/// This constructor doesn't check the validity of the second parameter (rdata
-/// length) for parsing.
-/// If necessary, the caller will check consistency.
-///
-/// \throw std::bad_alloc Memory allocation for names fails.
-/// \throw Other The constructor of the \c Name class will throw if the
-/// names in the wire is invalid.
-MINFO::MINFO(InputBuffer& buffer, size_t) :
-    rmailbox_(buffer), emailbox_(buffer)
-{}
-
-/// \brief Copy constructor.
-///
-/// \throw std::bad_alloc Memory allocation fails in copying internal
-/// member variables (this should be very rare).
-MINFO::MINFO(const MINFO& other) :
-    Rdata(), rmailbox_(other.rmailbox_), emailbox_(other.emailbox_)
-{}
-
-/// \brief Convert the \c MINFO to a string.
-///
-/// The output of this method is formatted as described in the "from string"
-/// constructor (\c MINFO(const std::string&))).
-///
-/// \throw std::bad_alloc Internal resource allocation fails.
-///
-/// \return A \c string object that represents the \c MINFO object.
-std::string
-MINFO::toText() const {
-    return (rmailbox_.toText() + " " + emailbox_.toText());
-}
-
-/// \brief Render the \c MINFO in the wire format without name compression.
-///
-/// \throw std::bad_alloc Internal resource allocation fails.
-///
-/// \param buffer An output buffer to store the wire data.
-void
-MINFO::toWire(OutputBuffer& buffer) const {
-    rmailbox_.toWire(buffer);
-    emailbox_.toWire(buffer);
-}
-
-MINFO&
-MINFO::operator=(const MINFO& source) {
-    rmailbox_ = source.rmailbox_;
-    emailbox_ = source.emailbox_;
-
-    return (*this);
-}
-
-/// \brief Render the \c MINFO in the wire format with taking into account
-/// compression.
-///
-/// As specified in RFC3597, TYPE MINFO is "well-known", the rmailbox and
-/// emailbox fields (domain names) will be compressed.
-///
-/// \throw std::bad_alloc Internal resource allocation fails.
-///
-/// \param renderer DNS message rendering context that encapsulates the
-/// output buffer and name compression information.
-void
-MINFO::toWire(AbstractMessageRenderer& renderer) const {
-    renderer.writeName(rmailbox_);
-    renderer.writeName(emailbox_);
-}
-
-/// \brief Compare two instances of \c MINFO RDATA.
-///
-/// See documentation in \c Rdata.
-int
-MINFO::compare(const Rdata& other) const {
-    const MINFO& other_minfo = dynamic_cast<const MINFO&>(other);
-
-    const int cmp = compareNames(rmailbox_, other_minfo.rmailbox_);
-    if (cmp != 0) {
-        return (cmp);
-    }
-    return (compareNames(emailbox_, other_minfo.emailbox_));
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/minfo_14.h b/src/lib/dns/rdata/generic/minfo_14.h
deleted file mode 100644
index ce9f43df33..0000000000
--- a/src/lib/dns/rdata/generic/minfo_14.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <string>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-/// \brief \c rdata::generic::MINFO class represents the MINFO RDATA as
-/// defined in RFC1035.
-///
-/// This class implements the basic interfaces inherited from the abstract
-/// \c rdata::Rdata class, and provides trivial accessors specific to the
-/// MINFO RDATA.
-class MINFO : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    /// \brief Define the assignment operator.
-    ///
-    /// \exception std::bad_alloc Memory allocation fails in copying
-    /// internal member variables (this should be very rare).
-    MINFO& operator=(const MINFO& source);
-
-    /// \brief Return the value of the rmailbox field.
-    ///
-    /// \throw std::bad_alloc If resource allocation for the returned
-    /// \c Name fails.
-    ///
-    /// \note
-    /// Unlike the case of some other RDATA classes (such as
-    /// \c NS::getNSName()), this method constructs a new \c Name object
-    /// and returns it, instead of returning a reference to a \c Name object
-    /// internally maintained in the class (which is a private member).
-    /// This is based on the observation that this method will be rarely
-    /// used and even when it's used it will not be in a performance context
-    /// (for example, a recursive resolver won't need this field in its
-    /// resolution process).  By returning a new object we have flexibility
-    /// of changing the internal representation without the risk of changing
-    /// the interface or method property.
-    /// The same note applies to the \c getEmailbox() method.
-    Name getRmailbox() const { return (rmailbox_); }
-
-    /// \brief Return the value of the emailbox field.
-    ///
-    /// \throw std::bad_alloc If resource allocation for the returned
-    /// \c Name fails.
-    Name getEmailbox() const { return (emailbox_); }
-
-private:
-    Name rmailbox_;
-    Name emailbox_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/mx_15.cc b/src/lib/dns/rdata/generic/mx_15.cc
deleted file mode 100644
index bbe8abcacb..0000000000
--- a/src/lib/dns/rdata/generic/mx_15.cc
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <string>
-
-#include <boost/lexical_cast.hpp>
-
-#include <exceptions/exceptions.h>
-
-#include <util/buffer.h>
-#include <dns/name.h>
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-#include <dns/rdata/generic/detail/lexer_util.h>
-
-using namespace std;
-using boost::lexical_cast;
-using namespace isc::util;
-using isc::dns::rdata::generic::detail::createNameFromLexer;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-MX::MX(InputBuffer& buffer, size_t) :
-    preference_(buffer.readUint16()), mxname_(buffer)
-{
-    // we don't need rdata_len for parsing.  if necessary, the caller will
-    // check consistency.
-}
-
-/// \brief Constructor from string.
-///
-/// The given string must represent a valid MX RDATA.  There can be extra
-/// space characters at the beginning or end of the text (which are simply
-/// ignored), but other extra text, including a new line, will make the
-/// construction fail with an exception.
-///
-/// The EXCHANGE name must be absolute since there's no parameter that
-/// specifies the origin name; if it is not absolute, \c MissingNameOrigin
-/// exception will be thrown. It must not be represented as a quoted
-/// string.
-///
-/// See the construction that takes \c MasterLexer for other fields.
-///
-/// \throw Others Exception from the Name and RRTTL constructors.
-/// \throw InvalidRdataText Other general syntax errors.
-MX::MX(const std::string& mx_str) :
-    // Fill in dummy name and replace them soon below.
-    preference_(0), mxname_(Name::ROOT_NAME())
-{
-    try {
-        std::istringstream ss(mx_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        constructFromLexer(lexer, NULL);
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText, "extra input text for MX: "
-                      << mx_str);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText, "Failed to construct MX from '" <<
-                  mx_str << "': " << ex.what());
-    }
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual representation
-/// of an MX RDATA.  The EXCHANGE field can be non-absolute if \c origin
-/// is non-NULL, in which case \c origin is used to make it absolute.
-/// It must not be represented as a quoted string.
-///
-/// The PREFERENCE field must be a valid decimal representation of an
-/// unsigned 16-bit integer.
-///
-/// \throw MasterLexer::LexerError General parsing error such as missing field.
-/// \throw Other Exceptions from the Name and RRTTL constructors if
-/// construction of textual fields as these objects fail.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-/// \param origin If non NULL, specifies the origin of EXCHANGE when it
-/// is non-absolute.
-MX::MX(MasterLexer& lexer, const Name* origin,
-       MasterLoader::Options, MasterLoaderCallbacks&) :
-    preference_(0), mxname_(Name::ROOT_NAME())
-{
-    constructFromLexer(lexer, origin);
-}
-
-void
-MX::constructFromLexer(MasterLexer& lexer, const Name* origin) {
-    const uint32_t num = lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (num > 65535) {
-        isc_throw(InvalidRdataText, "Invalid MX preference: " << num);
-    }
-    preference_ = static_cast<uint16_t>(num);
-
-    mxname_ = createNameFromLexer(lexer, origin);
-}
-
-MX::MX(uint16_t preference, const Name& mxname) :
-    preference_(preference), mxname_(mxname)
-{}
-
-MX::MX(const MX& other) :
-    Rdata(), preference_(other.preference_), mxname_(other.mxname_)
-{}
-
-void
-MX::toWire(OutputBuffer& buffer) const {
-    buffer.writeUint16(preference_);
-    mxname_.toWire(buffer);
-}
-
-void
-MX::toWire(AbstractMessageRenderer& renderer) const {
-    renderer.writeUint16(preference_);
-    renderer.writeName(mxname_);
-}
-
-string
-MX::toText() const {
-    return (lexical_cast<string>(preference_) + " " + mxname_.toText());
-}
-
-int
-MX::compare(const Rdata& other) const {
-    const MX& other_mx = dynamic_cast<const MX&>(other);
-
-    if (preference_ < other_mx.preference_) {
-        return (-1);
-    } else if (preference_ > other_mx.preference_) {
-        return (1);
-    }
-
-    return (compareNames(mxname_, other_mx.mxname_));
-}
-
-const Name&
-MX::getMXName() const {
-    return (mxname_);
-}
-
-uint16_t
-MX::getMXPref() const {
-    return (preference_);
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/mx_15.h b/src/lib/dns/rdata/generic/mx_15.h
deleted file mode 100644
index b688f882cd..0000000000
--- a/src/lib/dns/rdata/generic/mx_15.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <stdint.h>
-
-#include <string>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-class MX : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    MX(uint16_t preference, const Name& mxname);
-
-    ///
-    /// Specialized methods
-    ///
-    const Name& getMXName() const;
-    uint16_t getMXPref() const;
-
-private:
-    void constructFromLexer(isc::dns::MasterLexer& lexer,
-                            const isc::dns::Name* origin);
-
-    /// Note: this is a prototype version; we may reconsider
-    /// this representation later.
-    uint16_t preference_;
-    Name mxname_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/naptr_35.cc b/src/lib/dns/rdata/generic/naptr_35.cc
deleted file mode 100644
index aa2d7f54c6..0000000000
--- a/src/lib/dns/rdata/generic/naptr_35.cc
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <dns/name.h>
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-#include <dns/rdata/generic/detail/char_string.h>
-#include <exceptions/exceptions.h>
-
-#include <string>
-#include <boost/lexical_cast.hpp>
-
-using namespace std;
-using boost::lexical_cast;
-using namespace isc::util;
-using namespace isc::dns;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-class NAPTRImpl {
-public:
-    NAPTRImpl() : order(0), preference(0), replacement(".") {}
-
-    NAPTRImpl(InputBuffer& buffer, size_t rdata_len) : replacement(".") {
-        if (rdata_len < 4 || buffer.getLength() - buffer.getPosition() < 4) {
-            isc_throw(isc::dns::DNSMessageFORMERR, "Error in parsing "
-                      "NAPTR RDATA wire format: insufficient length ");
-        }
-        order = buffer.readUint16();
-        preference = buffer.readUint16();
-        rdata_len -= 4;
-
-        rdata_len -= detail::bufferToCharString(buffer, rdata_len, flags);
-        rdata_len -= detail::bufferToCharString(buffer, rdata_len, services);
-        rdata_len -= detail::bufferToCharString(buffer, rdata_len, regexp);
-        replacement = Name(buffer);
-        if (rdata_len < 1) {
-            isc_throw(isc::dns::DNSMessageFORMERR, "Error in parsing "
-                      "NAPTR RDATA wire format: missing replacement name");
-        }
-        rdata_len -= replacement.getLength();
-
-        if (rdata_len != 0) {
-            isc_throw(isc::dns::DNSMessageFORMERR, "Error in parsing " <<
-                      "NAPTR RDATA: bytes left at end: " <<
-                      static_cast<int>(rdata_len));
-        }
-    }
-
-    NAPTRImpl(const std::string& naptr_str) : replacement(".") {
-        std::istringstream ss(naptr_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        try {
-            parseNAPTRData(lexer);
-            // Should be at end of data now
-            if (lexer.getNextToken(MasterToken::QSTRING, true).getType() !=
-                MasterToken::END_OF_FILE) {
-                isc_throw(InvalidRdataText,
-                          "Invalid NAPTR text format: too many fields.");
-            }
-        } catch (const MasterLexer::LexerError& ex) {
-            isc_throw(InvalidRdataText, "Failed to construct NAPTR RDATA from "
-                                        << naptr_str << "': " << ex.what());
-        }
-    }
-
-    NAPTRImpl(MasterLexer& lexer) : replacement(".")
-    {
-        parseNAPTRData(lexer);
-    }
-
-private:
-    void
-    parseNAPTRData(MasterLexer& lexer) {
-        MasterToken token = lexer.getNextToken(MasterToken::NUMBER);
-        if (token.getNumber() > 65535) {
-            isc_throw(InvalidRdataText,
-                      "Invalid NAPTR text format: order out of range: "
-                      << token.getNumber());
-        }
-        order = token.getNumber();
-        token = lexer.getNextToken(MasterToken::NUMBER);
-        if (token.getNumber() > 65535) {
-            isc_throw(InvalidRdataText,
-                      "Invalid NAPTR text format: preference out of range: "
-                      << token.getNumber());
-        }
-        preference = token.getNumber();
-
-        token = lexer.getNextToken(MasterToken::QSTRING);
-        stringToCharString(token.getStringRegion(), flags);
-        token = lexer.getNextToken(MasterToken::QSTRING);
-        stringToCharString(token.getStringRegion(), services);
-        token = lexer.getNextToken(MasterToken::QSTRING);
-        stringToCharString(token.getStringRegion(), regexp);
-
-        token = lexer.getNextToken(MasterToken::STRING);
-        replacement = Name(token.getString());
-    }
-
-
-public:
-    uint16_t order;
-    uint16_t preference;
-    detail::CharString flags;
-    detail::CharString services;
-    detail::CharString regexp;
-    Name replacement;
-};
-
-NAPTR::NAPTR(InputBuffer& buffer, size_t rdata_len) :
-    impl_(new NAPTRImpl(buffer, rdata_len))
-{}
-
-NAPTR::NAPTR(const std::string& naptr_str) : impl_(new NAPTRImpl(naptr_str))
-{}
-
-NAPTR::NAPTR(MasterLexer& lexer, const Name*,
-             MasterLoader::Options, MasterLoaderCallbacks&) :
-    impl_(new NAPTRImpl(lexer))
-{}
-
-NAPTR::NAPTR(const NAPTR& naptr) :  Rdata(),
-                                    impl_(new NAPTRImpl(*naptr.impl_))
-{}
-
-NAPTR&
-NAPTR::operator=(const NAPTR& source)
-{
-    impl_.reset(new NAPTRImpl(*source.impl_));
-    return (*this);
-}
-
-NAPTR::~NAPTR() {
-}
-
-void
-NAPTR::toWire(OutputBuffer& buffer) const {
-    toWireHelper(buffer);
-    impl_->replacement.toWire(buffer);
-}
-
-void
-NAPTR::toWire(AbstractMessageRenderer& renderer) const {
-    toWireHelper(renderer);
-    // Type NAPTR is not "well-known", and name compression must be disabled
-    // per RFC3597.
-    renderer.writeName(impl_->replacement, false);
-}
-
-string
-NAPTR::toText() const {
-    string result;
-    result += lexical_cast<string>(impl_->order);
-    result += " ";
-    result += lexical_cast<string>(impl_->preference);
-    result += " \"";
-    result += detail::charStringToString(impl_->flags);
-    result += "\" \"";
-    result += detail::charStringToString(impl_->services);
-    result += "\" \"";
-    result += detail::charStringToString(impl_->regexp);
-    result += "\" ";
-    result += impl_->replacement.toText();
-    return (result);
-}
-
-int
-NAPTR::compare(const Rdata& other) const {
-    const NAPTR other_naptr = dynamic_cast<const NAPTR&>(other);
-
-    if (impl_->order < other_naptr.impl_->order) {
-        return (-1);
-    } else if (impl_->order > other_naptr.impl_->order) {
-        return (1);
-    }
-
-    if (impl_->preference < other_naptr.impl_->preference) {
-        return (-1);
-    } else if (impl_->preference > other_naptr.impl_->preference) {
-        return (1);
-    }
-
-    const int fcmp = detail::compareCharStrings(impl_->flags,
-                                                other_naptr.impl_->flags);
-    if (fcmp != 0) {
-        return (fcmp);
-    }
-
-    const int scmp = detail::compareCharStrings(impl_->services,
-                                                other_naptr.impl_->services);
-    if (scmp != 0) {
-        return (scmp);
-    }
-
-    const int rcmp = detail::compareCharStrings(impl_->regexp,
-                                                other_naptr.impl_->regexp);
-    if (rcmp != 0) {
-        return (rcmp);
-    }
-
-    return (compareNames(impl_->replacement, other_naptr.impl_->replacement));
-}
-
-uint16_t
-NAPTR::getOrder() const {
-    return (impl_->order);
-}
-
-uint16_t
-NAPTR::getPreference() const {
-    return (impl_->preference);
-}
-
-const std::string
-NAPTR::getFlags() const {
-    return (detail::charStringToString(impl_->flags));
-}
-
-const std::string
-NAPTR::getServices() const {
-    return (detail::charStringToString(impl_->services));
-}
-
-const std::string
-NAPTR::getRegexp() const {
-    return (detail::charStringToString(impl_->regexp));
-}
-
-const Name&
-NAPTR::getReplacement() const {
-    return (impl_->replacement);
-}
-
-template <typename T>
-void
-NAPTR::toWireHelper(T& outputer) const {
-    outputer.writeUint16(impl_->order);
-    outputer.writeUint16(impl_->preference);
-
-    outputer.writeData(&impl_->flags[0], impl_->flags.size());
-    outputer.writeData(&impl_->services[0], impl_->services.size());
-    outputer.writeData(&impl_->regexp[0], impl_->regexp.size());
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/naptr_35.h b/src/lib/dns/rdata/generic/naptr_35.h
deleted file mode 100644
index c77b95d0a8..0000000000
--- a/src/lib/dns/rdata/generic/naptr_35.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <string>
-
-#include <boost/scoped_ptr.hpp>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-#include <util/buffer.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-class NAPTRImpl;
-
-/// \brief \c NAPTR class represents the NAPTR rdata defined in
-/// RFC2915, RFC2168 and RFC3403
-///
-/// This class implements the basic interfaces inherited from the
-/// \c rdata::Rdata class, and provides accessors specific to the
-/// NAPTR rdata.
-class NAPTR : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    // NAPTR specific methods
-    ~NAPTR();
-
-    NAPTR& operator=(const NAPTR& source);
-
-    uint16_t getOrder() const;
-    uint16_t getPreference() const;
-    const std::string getFlags() const;
-    const std::string getServices() const;
-    const std::string getRegexp() const;
-    const Name& getReplacement() const;
-private:
-    /// Helper template function for toWire()
-    ///
-    /// \param outputer Where to write data in
-    template <typename T>
-    void toWireHelper(T& outputer) const;
-
-    boost::scoped_ptr<NAPTRImpl> impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/ns_2.cc b/src/lib/dns/rdata/generic/ns_2.cc
deleted file mode 100644
index 7c1fd01257..0000000000
--- a/src/lib/dns/rdata/generic/ns_2.cc
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <string>
-
-#include <util/buffer.h>
-#include <dns/name.h>
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-#include <dns/rdata/generic/detail/lexer_util.h>
-
-using namespace std;
-using namespace isc::util;
-using isc::dns::rdata::generic::detail::createNameFromLexer;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-/// \brief Constructor from string.
-///
-/// The given string must represent a valid NS RDATA.  There can be extra
-/// space characters at the beginning or end of the text (which are simply
-/// ignored), but other extra text, including a new line, will make the
-/// construction fail with an exception.
-///
-/// The NSDNAME must be absolute since there's no parameter that
-/// specifies the origin name; if it is not absolute, \c
-/// MissingNameOrigin exception will be thrown.  These must not be
-/// represented as a quoted string.
-///
-/// \throw Others Exception from the Name and RRTTL constructors.
-/// \throw InvalidRdataText Other general syntax errors.
-NS::NS(const std::string& namestr) :
-    // Fill in dummy name and replace them soon below.
-    nsname_(Name::ROOT_NAME())
-{
-    try {
-        std::istringstream ss(namestr);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        nsname_ = createNameFromLexer(lexer, NULL);
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText, "extra input text for NS: "
-                      << namestr);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText, "Failed to construct NS from '" <<
-                  namestr << "': " << ex.what());
-    }
-}
-
-NS::NS(InputBuffer& buffer, size_t) :
-    nsname_(buffer)
-{
-    // we don't need rdata_len for parsing.  if necessary, the caller will
-    // check consistency.
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual
-/// representation of an NS RDATA.  The NSDNAME field can be
-/// non-absolute if \c origin is non-NULL, in which case \c origin is
-/// used to make it absolute.  It must not be represented as a quoted
-/// string.
-///
-/// \throw MasterLexer::LexerError General parsing error such as missing field.
-/// \throw Other Exceptions from the Name and RRTTL constructors if
-/// construction of textual fields as these objects fail.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-/// \param origin If non NULL, specifies the origin of NSDNAME when it
-/// is non-absolute.
-NS::NS(MasterLexer& lexer, const Name* origin,
-       MasterLoader::Options, MasterLoaderCallbacks&) :
-    nsname_(createNameFromLexer(lexer, origin))
-{}
-
-NS::NS(const NS& other) :
-    Rdata(), nsname_(other.nsname_)
-{}
-
-void
-NS::toWire(OutputBuffer& buffer) const {
-    nsname_.toWire(buffer);
-}
-
-void
-NS::toWire(AbstractMessageRenderer& renderer) const {
-    renderer.writeName(nsname_);
-}
-
-string
-NS::toText() const {
-    return (nsname_.toText());
-}
-
-int
-NS::compare(const Rdata& other) const {
-    const NS& other_ns = dynamic_cast<const NS&>(other);
-
-    return (compareNames(nsname_, other_ns.nsname_));
-}
-
-const Name&
-NS::getNSName() const {
-    return (nsname_);
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/ns_2.h b/src/lib/dns/rdata/generic/ns_2.h
deleted file mode 100644
index 18c3cf671f..0000000000
--- a/src/lib/dns/rdata/generic/ns_2.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <string>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-class NS : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-    ///
-    /// Specialized constructor
-    ///
-    explicit NS(const Name& nsname) : nsname_(nsname) {}
-    ///
-    /// Specialized methods
-    ///
-    const Name& getNSName() const;
-private:
-    Name nsname_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/nsec3_50.cc b/src/lib/dns/rdata/generic/nsec3_50.cc
deleted file mode 100644
index 398757931c..0000000000
--- a/src/lib/dns/rdata/generic/nsec3_50.cc
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright (C) 2010-2024 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <iostream>
-#include <iomanip>
-#include <string>
-#include <sstream>
-#include <vector>
-#include <cassert>
-
-#include <boost/lexical_cast.hpp>
-
-#include <util/encode/encode.h>
-#include <util/buffer.h>
-
-#include <dns/exceptions.h>
-#include <dns/messagerenderer.h>
-#include <dns/name.h>
-#include <dns/rrtype.h>
-#include <dns/rrttl.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-#include <dns/rdata/generic/detail/nsec_bitmap.h>
-#include <dns/rdata/generic/detail/nsec3param_common.h>
-
-#include <memory>
-
-#include <stdio.h>
-#include <time.h>
-
-using namespace std;
-using namespace isc::dns::rdata::generic::detail::nsec;
-using namespace isc::dns::rdata::generic::detail::nsec3;
-using namespace isc::util::encode;
-using namespace isc::util;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-struct NSEC3Impl {
-    // straightforward representation of NSEC3 RDATA fields
-    NSEC3Impl(uint8_t hashalg, uint8_t flags, uint16_t iterations,
-              vector<uint8_t>salt, vector<uint8_t>next,
-              vector<uint8_t> typebits) :
-        hashalg_(hashalg), flags_(flags), iterations_(iterations),
-        salt_(salt), next_(next), typebits_(typebits)
-    {}
-
-    const uint8_t hashalg_;
-    const uint8_t flags_;
-    const uint16_t iterations_;
-    const vector<uint8_t> salt_;
-    const vector<uint8_t> next_;
-    const vector<uint8_t> typebits_;
-};
-
-/// \brief Constructor from string.
-///
-/// The given string must represent a valid NSEC3 RDATA.  There
-/// can be extra space characters at the beginning or end of the
-/// text (which are simply ignored), but other extra text, including
-/// a new line, will make the construction fail with an exception.
-///
-/// The Hash Algorithm, Flags and Iterations fields must be within their
-/// valid ranges. The Salt field may contain "-" to indicate that the
-/// salt is of length 0. The Salt field must not contain any whitespace.
-/// The type mnemonics must be valid, and separated by whitespace. If
-/// any invalid mnemonics are found, InvalidRdataText exception is
-/// thrown.
-///
-/// \throw InvalidRdataText if any fields are out of their valid range,
-/// or are incorrect.
-///
-/// \param nsec3_str A string containing the RDATA to be created
-NSEC3::NSEC3(const std::string& nsec3_str) :
-    impl_(NULL)
-{
-    // We use unique_ptr here because if there is an exception in this
-    // constructor, the destructor is not called and there could be a
-    // leak of the NSEC3Impl that constructFromLexer() returns.
-    std::unique_ptr<NSEC3Impl> impl_ptr;
-
-    try {
-        std::istringstream ss(nsec3_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        impl_ptr.reset(constructFromLexer(lexer));
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText,
-                      "Extra input text for NSEC3: " << nsec3_str);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText,
-                  "Failed to construct NSEC3 from '" << nsec3_str << "': "
-                  << ex.what());
-    }
-
-    impl_ = impl_ptr.release();
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual
-/// representation of an NSEC3 RDATA.
-///
-/// See \c NSEC3::NSEC3(const std::string&) for description of the
-/// expected RDATA fields.
-///
-/// \throw MasterLexer::LexerError General parsing error such as
-/// missing field.
-/// \throw InvalidRdataText if any fields are out of their valid range,
-/// or are incorrect.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-NSEC3::NSEC3(MasterLexer& lexer, const Name*, MasterLoader::Options,
-             MasterLoaderCallbacks&) :
-    impl_(NULL)
-{
-    impl_ = constructFromLexer(lexer);
-}
-
-NSEC3Impl*
-NSEC3::constructFromLexer(MasterLexer& lexer) {
-    vector<uint8_t> salt;
-    const ParseNSEC3ParamResult params =
-        parseNSEC3ParamFromLexer("NSEC3", lexer, salt);
-
-    const string& nexthash =
-        lexer.getNextToken(MasterToken::STRING).getString();
-    if (*nexthash.rbegin() == '=') {
-        isc_throw(InvalidRdataText, "NSEC3 hash has padding: " << nexthash);
-    }
-
-    vector<uint8_t> next;
-    decodeBase32Hex(nexthash, next);
-    if (next.size() > 255) {
-        isc_throw(InvalidRdataText, "NSEC3 hash is too long: "
-                  << next.size() << " bytes");
-    }
-
-    vector<uint8_t> typebits;
-    // For NSEC3 empty bitmap is possible and allowed.
-    buildBitmapsFromLexer("NSEC3", lexer, typebits, true);
-    return (new NSEC3Impl(params.algorithm, params.flags, params.iterations,
-                          salt, next, typebits));
-}
-
-NSEC3::NSEC3(InputBuffer& buffer, size_t rdata_len) :
-    impl_(NULL)
-{
-    vector<uint8_t> salt;
-    const ParseNSEC3ParamResult params =
-        parseNSEC3ParamWire("NSEC3", buffer, rdata_len, salt);
-
-    if (rdata_len < 1) {
-        isc_throw(DNSMessageFORMERR, "NSEC3 too short to contain hash length, "
-                  "length: " << rdata_len + salt.size() + 5);
-    }
-    const uint8_t nextlen = buffer.readUint8();
-    --rdata_len;
-    if (nextlen == 0 || rdata_len < nextlen) {
-        isc_throw(DNSMessageFORMERR, "NSEC3 invalid hash length: " <<
-                  static_cast<unsigned int>(nextlen));
-    }
-
-    vector<uint8_t> next(nextlen);
-    buffer.readData(&next[0], nextlen);
-    rdata_len -= nextlen;
-
-    vector<uint8_t> typebits(rdata_len);
-    if (rdata_len > 0) {
-        // Read and parse the bitmaps only when they exist; empty bitmap
-        // is possible for NSEC3.
-        buffer.readData(&typebits[0], rdata_len);
-        checkRRTypeBitmaps("NSEC3", typebits);
-    }
-
-    impl_ = new NSEC3Impl(params.algorithm, params.flags, params.iterations,
-                          salt, next, typebits);
-}
-
-NSEC3::NSEC3(const NSEC3& source) :
-    Rdata(), impl_(new NSEC3Impl(*source.impl_))
-{}
-
-NSEC3&
-NSEC3::operator=(const NSEC3& source) {
-    if (this == &source) {
-        return (*this);
-    }
-
-    NSEC3Impl* newimpl = new NSEC3Impl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
-
-    return (*this);
-}
-
-NSEC3::~NSEC3() {
-    delete impl_;
-}
-
-string
-NSEC3::toText() const {
-    ostringstream s;
-    bitmapsToText(impl_->typebits_, s);
-
-    using boost::lexical_cast;
-    return (lexical_cast<string>(static_cast<int>(impl_->hashalg_)) +
-            " " + lexical_cast<string>(static_cast<int>(impl_->flags_)) +
-            " " + lexical_cast<string>(static_cast<int>(impl_->iterations_)) +
-            " " + (impl_->salt_.empty() ? "-" : encodeHex(impl_->salt_)) +
-            " " + encodeBase32Hex(impl_->next_) + s.str());
-}
-
-template <typename OUTPUT_TYPE>
-void
-toWireHelper(const NSEC3Impl& impl, OUTPUT_TYPE& output) {
-    output.writeUint8(impl.hashalg_);
-    output.writeUint8(impl.flags_);
-    output.writeUint16(impl.iterations_);
-    output.writeUint8(impl.salt_.size());
-    if (!impl.salt_.empty()) {
-        output.writeData(&impl.salt_[0], impl.salt_.size());
-    }
-    assert(!impl.next_.empty());
-    output.writeUint8(impl.next_.size());
-    output.writeData(&impl.next_[0], impl.next_.size());
-    if (!impl.typebits_.empty()) {
-        output.writeData(&impl.typebits_[0], impl.typebits_.size());
-    }
-}
-
-void
-NSEC3::toWire(OutputBuffer& buffer) const {
-    toWireHelper(*impl_, buffer);
-}
-
-void
-NSEC3::toWire(AbstractMessageRenderer& renderer) const {
-    toWireHelper(*impl_, renderer);
-}
-
-namespace {
-// This is a helper subroutine for compare().  It compares two binary
-// data stored in vector<uint8_t> objects based on the "Canonical RR Ordering"
-// as defined in Section 6.3 of RFC4034, that is, the data are treated
-// "as a left-justified unsigned octet sequence in which the absence of an
-// octet sorts before a zero octet."
-//
-// If check_length_first is true, it treats the compared data as if they
-// began with a single-octet "length" field whose value is the size of the
-// corresponding vector.  In this case, if the sizes of the two vectors are
-// different the shorter one is always considered the "smaller"; the contents
-// of the vector don't matter.
-//
-// This function returns:
-// -1 if v1 is considered smaller than v2
-// 1 if v1 is considered larger than v2
-// 0 otherwise
-int
-compareVectors(const vector<uint8_t>& v1, const vector<uint8_t>& v2,
-               bool check_length_first = true)
-{
-    const size_t len1 = v1.size();
-    const size_t len2 = v2.size();
-    if (check_length_first && len1 != len2) {
-        return (len1 - len2);
-    }
-    const size_t cmplen = min(len1, len2);
-    const int cmp = cmplen == 0 ? 0 : memcmp(&v1.at(0), &v2.at(0), cmplen);
-    if (cmp != 0) {
-        return (cmp);
-    } else {
-        return (len1 - len2);
-    }
-}
-}
-
-int
-NSEC3::compare(const Rdata& other) const {
-    const NSEC3& other_nsec3 = dynamic_cast<const NSEC3&>(other);
-
-    if (impl_->hashalg_ != other_nsec3.impl_->hashalg_) {
-        return (impl_->hashalg_ < other_nsec3.impl_->hashalg_ ? -1 : 1);
-    }
-    if (impl_->flags_ != other_nsec3.impl_->flags_) {
-        return (impl_->flags_ < other_nsec3.impl_->flags_ ? -1 : 1);
-    }
-    if (impl_->iterations_ != other_nsec3.impl_->iterations_) {
-        return (impl_->iterations_ < other_nsec3.impl_->iterations_ ? -1 : 1);
-    }
-
-    int cmp = compareVectors(impl_->salt_, other_nsec3.impl_->salt_);
-    if (cmp != 0) {
-        return (cmp);
-    }
-    cmp = compareVectors(impl_->next_, other_nsec3.impl_->next_);
-    if (cmp != 0) {
-        return (cmp);
-    }
-    // Note that bitmap doesn't have a dedicated length field, so we shouldn't
-    // terminate the comparison just because the lengths are different.
-    return (compareVectors(impl_->typebits_, other_nsec3.impl_->typebits_,
-                           false));
-}
-
-uint8_t
-NSEC3::getHashalg() const {
-    return (impl_->hashalg_);
-}
-
-uint8_t
-NSEC3::getFlags() const {
-    return (impl_->flags_);
-}
-
-uint16_t
-NSEC3::getIterations() const {
-    return (impl_->iterations_);
-}
-
-const vector<uint8_t>&
-NSEC3::getSalt() const {
-    return (impl_->salt_);
-}
-
-const vector<uint8_t>&
-NSEC3::getNext() const {
-    return (impl_->next_);
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/nsec3_50.h b/src/lib/dns/rdata/generic/nsec3_50.h
deleted file mode 100644
index cf73624f58..0000000000
--- a/src/lib/dns/rdata/generic/nsec3_50.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <stdint.h>
-
-#include <string>
-#include <vector>
-
-#include <dns/name.h>
-#include <dns/rrtype.h>
-#include <dns/rrttl.h>
-#include <dns/rdata.h>
-#include <dns/master_lexer.h>
-
-// BEGIN_HEADER_GUARD
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-struct NSEC3Impl;
-
-class NSEC3 : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-    NSEC3& operator=(const NSEC3& source);
-    ~NSEC3();
-
-    uint8_t getHashalg() const;
-    uint8_t getFlags() const;
-    uint16_t getIterations() const;
-    const std::vector<uint8_t>& getSalt() const;
-    const std::vector<uint8_t>& getNext() const;
-
-private:
-    NSEC3Impl* constructFromLexer(isc::dns::MasterLexer& lexer);
-
-    NSEC3Impl* impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/nsec3param_51.cc b/src/lib/dns/rdata/generic/nsec3param_51.cc
deleted file mode 100644
index 74a7109f23..0000000000
--- a/src/lib/dns/rdata/generic/nsec3param_51.cc
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (C) 2010-2024 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <util/buffer.h>
-#include <util/encode/encode.h>
-
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-#include <dns/rdata/generic/detail/nsec3param_common.h>
-
-#include <boost/lexical_cast.hpp>
-
-#include <memory>
-#include <string>
-#include <sstream>
-#include <vector>
-
-using namespace std;
-using namespace isc::util;
-using namespace isc::util::encode;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-struct NSEC3PARAMImpl {
-    // straightforward representation of NSEC3PARAM RDATA fields
-    NSEC3PARAMImpl(uint8_t hashalg, uint8_t flags, uint16_t iterations,
-                   const vector<uint8_t>& salt) :
-        hashalg_(hashalg), flags_(flags), iterations_(iterations), salt_(salt)
-    {}
-
-    const uint8_t hashalg_;
-    const uint8_t flags_;
-    const uint16_t iterations_;
-    const vector<uint8_t> salt_;
-};
-
-/// \brief Constructor from string.
-///
-/// The given string must represent a valid NSEC3PARAM RDATA.  There
-/// can be extra space characters at the beginning or end of the
-/// text (which are simply ignored), but other extra text, including
-/// a new line, will make the construction fail with an exception.
-///
-/// The Hash Algorithm, Flags and Iterations fields must be within their
-/// valid ranges. The Salt field may contain "-" to indicate that the
-/// salt is of length 0. The Salt field must not contain any whitespace.
-///
-/// \throw InvalidRdataText if any fields are out of their valid range,
-/// or are incorrect.
-///
-/// \param nsec3param_str A string containing the RDATA to be created
-NSEC3PARAM::NSEC3PARAM(const std::string& nsec3param_str) :
-    impl_(NULL)
-{
-    // We use unique_ptr here because if there is an exception in this
-    // constructor, the destructor is not called and there could be a
-    // leak of the NSEC3PARAMImpl that constructFromLexer() returns.
-    std::unique_ptr<NSEC3PARAMImpl> impl_ptr;
-
-    try {
-        std::istringstream ss(nsec3param_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        impl_ptr.reset(constructFromLexer(lexer));
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText,
-                      "Extra input text for NSEC3PARAM: " << nsec3param_str);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText,
-                  "Failed to construct NSEC3PARAM from '" << nsec3param_str
-                  << "': " << ex.what());
-    }
-
-    impl_ = impl_ptr.release();
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual
-/// representation of an NSEC3PARAM RDATA.
-///
-/// See \c NSEC3PARAM::NSEC3PARAM(const std::string&) for description of
-/// the expected RDATA fields.
-///
-/// \throw MasterLexer::LexerError General parsing error such as
-/// missing field.
-/// \throw InvalidRdataText if any fields are out of their valid range,
-/// or are incorrect.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-NSEC3PARAM::NSEC3PARAM(MasterLexer& lexer, const Name*, MasterLoader::Options,
-                       MasterLoaderCallbacks&) :
-    impl_(NULL)
-{
-    impl_ = constructFromLexer(lexer);
-}
-
-NSEC3PARAMImpl*
-NSEC3PARAM::constructFromLexer(MasterLexer& lexer) {
-    vector<uint8_t> salt;
-    const ParseNSEC3ParamResult params =
-        parseNSEC3ParamFromLexer("NSEC3PARAM", lexer, salt);
-
-    return (new NSEC3PARAMImpl(params.algorithm, params.flags,
-                               params.iterations, salt));
-}
-
-NSEC3PARAM::NSEC3PARAM(InputBuffer& buffer, size_t rdata_len) :
-    impl_(NULL)
-{
-    vector<uint8_t> salt;
-    const ParseNSEC3ParamResult params =
-        parseNSEC3ParamWire("NSEC3PARAM", buffer, rdata_len, salt);
-
-    impl_ = new NSEC3PARAMImpl(params.algorithm, params.flags,
-                               params.iterations, salt);
-}
-
-NSEC3PARAM::NSEC3PARAM(const NSEC3PARAM& source) :
-    Rdata(), impl_(new NSEC3PARAMImpl(*source.impl_))
-{}
-
-NSEC3PARAM&
-NSEC3PARAM::operator=(const NSEC3PARAM& source) {
-    if (this == &source) {
-        return (*this);
-    }
-
-    NSEC3PARAMImpl* newimpl = new NSEC3PARAMImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
-
-    return (*this);
-}
-
-NSEC3PARAM::~NSEC3PARAM() {
-    delete impl_;
-}
-
-string
-NSEC3PARAM::toText() const {
-    using boost::lexical_cast;
-    return (lexical_cast<string>(static_cast<int>(impl_->hashalg_)) +
-            " " + lexical_cast<string>(static_cast<int>(impl_->flags_)) +
-            " " + lexical_cast<string>(static_cast<int>(impl_->iterations_)) +
-            " " + (impl_->salt_.empty() ? "-" : encodeHex(impl_->salt_)));
-}
-
-template <typename OUTPUT_TYPE>
-void
-toWireHelper(const NSEC3PARAMImpl& impl, OUTPUT_TYPE& output) {
-    output.writeUint8(impl.hashalg_);
-    output.writeUint8(impl.flags_);
-    output.writeUint16(impl.iterations_);
-    output.writeUint8(impl.salt_.size());
-    if (!impl.salt_.empty()) {
-        output.writeData(&impl.salt_[0], impl.salt_.size());
-    }
-}
-
-void
-NSEC3PARAM::toWire(OutputBuffer& buffer) const {
-    toWireHelper(*impl_, buffer);
-}
-
-void
-NSEC3PARAM::toWire(AbstractMessageRenderer& renderer) const {
-    toWireHelper(*impl_, renderer);
-}
-
-int
-NSEC3PARAM::compare(const Rdata& other) const {
-    const NSEC3PARAM& other_param = dynamic_cast<const NSEC3PARAM&>(other);
-
-    if (impl_->hashalg_ != other_param.impl_->hashalg_) {
-        return (impl_->hashalg_ < other_param.impl_->hashalg_ ? -1 : 1);
-    }
-    if (impl_->flags_ != other_param.impl_->flags_) {
-        return (impl_->flags_ < other_param.impl_->flags_ ? -1 : 1);
-    }
-    if (impl_->iterations_ != other_param.impl_->iterations_) {
-        return (impl_->iterations_ < other_param.impl_->iterations_ ? -1 : 1);
-    }
-
-    const size_t this_len = impl_->salt_.size();
-    const size_t other_len = other_param.impl_->salt_.size();
-    if (this_len != other_len) {
-        return (this_len - other_len);
-    }
-    const size_t cmplen = min(this_len, other_len);
-    const int cmp = (cmplen == 0) ? 0 :
-        memcmp(&impl_->salt_.at(0), &other_param.impl_->salt_.at(0), cmplen);
-    if (cmp != 0) {
-        return (cmp);
-    } else {
-        return (this_len - other_len);
-    }
-}
-
-uint8_t
-NSEC3PARAM::getHashalg() const {
-    return (impl_->hashalg_);
-}
-
-uint8_t
-NSEC3PARAM::getFlags() const {
-    return (impl_->flags_);
-}
-
-uint16_t
-NSEC3PARAM::getIterations() const {
-    return (impl_->iterations_);
-}
-
-const vector<uint8_t>&
-NSEC3PARAM::getSalt() const {
-    return (impl_->salt_);
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/nsec3param_51.h b/src/lib/dns/rdata/generic/nsec3param_51.h
deleted file mode 100644
index 1c7bf03251..0000000000
--- a/src/lib/dns/rdata/generic/nsec3param_51.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <stdint.h>
-
-#include <string>
-#include <vector>
-
-#include <dns/name.h>
-#include <dns/rrtype.h>
-#include <dns/rrttl.h>
-#include <dns/rdata.h>
-#include <dns/master_lexer.h>
-
-// BEGIN_HEADER_GUARD
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-struct NSEC3PARAMImpl;
-
-class NSEC3PARAM : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-    NSEC3PARAM& operator=(const NSEC3PARAM& source);
-    ~NSEC3PARAM();
-
-    ///
-    /// Specialized methods
-    ///
-    uint8_t getHashalg() const;
-    uint8_t getFlags() const;
-    uint16_t getIterations() const;
-    const std::vector<uint8_t>& getSalt() const;
-
-private:
-    NSEC3PARAMImpl* constructFromLexer(isc::dns::MasterLexer& lexer);
-
-    NSEC3PARAMImpl* impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/nsec_47.cc b/src/lib/dns/rdata/generic/nsec_47.cc
deleted file mode 100644
index e78e18aa77..0000000000
--- a/src/lib/dns/rdata/generic/nsec_47.cc
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (C) 2010-2024 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <iostream>
-#include <string>
-#include <sstream>
-#include <vector>
-
-#include <util/encode/encode.h>
-#include <util/buffer.h>
-#include <dns/exceptions.h>
-#include <dns/messagerenderer.h>
-#include <dns/name.h>
-#include <dns/rrtype.h>
-#include <dns/rrttl.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-#include <dns/rdata/generic/detail/nsec_bitmap.h>
-#include <dns/rdata/generic/detail/lexer_util.h>
-
-#include <stdio.h>
-#include <time.h>
-
-using namespace std;
-using namespace isc::util;
-using namespace isc::util::encode;
-using namespace isc::dns::rdata::generic::detail::nsec;
-using isc::dns::rdata::generic::detail::createNameFromLexer;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-struct NSECImpl {
-    // straightforward representation of NSEC RDATA fields
-    NSECImpl(const Name& next, vector<uint8_t> typebits) :
-        nextname_(next), typebits_(typebits)
-    {}
-
-    Name nextname_;
-    vector<uint8_t> typebits_;
-};
-
-/// \brief Constructor from string.
-///
-/// The given string must represent a valid NSEC RDATA.  There
-/// can be extra space characters at the beginning or end of the
-/// text (which are simply ignored), but other extra text, including
-/// a new line, will make the construction fail with an exception.
-///
-/// The Next Domain Name field must be absolute since there's no
-/// parameter that specifies the origin name; if it is not absolute,
-/// \c MissingNameOrigin exception will be thrown.  This must not be
-/// represented as a quoted string.
-///
-/// The type mnemonics must be valid, and separated by whitespace. If
-/// any invalid mnemonics are found, InvalidRdataText exception is
-/// thrown.
-///
-/// \throw MissingNameOrigin Thrown when the Next Domain Name is not absolute.
-/// \throw InvalidRdataText if any fields are out of their valid range.
-///
-/// \param nsec_str A string containing the RDATA to be created
-NSEC::NSEC(const std::string& nsec_str) :
-    impl_(NULL)
-{
-    try {
-        std::istringstream ss(nsec_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        const Name origin_name(createNameFromLexer(lexer, NULL));
-
-        vector<uint8_t> typebits;
-        buildBitmapsFromLexer("NSEC", lexer, typebits);
-
-        impl_ = new NSECImpl(origin_name, typebits);
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText,
-                      "Extra input text for NSEC: " << nsec_str);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText,
-                  "Failed to construct NSEC from '" << nsec_str << "': "
-                  << ex.what());
-    }
-}
-
-NSEC::NSEC(InputBuffer& buffer, size_t rdata_len) {
-    const size_t pos = buffer.getPosition();
-    const Name nextname(buffer);
-
-    // rdata_len must be sufficiently large to hold non empty bitmap.
-    if (rdata_len <= buffer.getPosition() - pos) {
-        isc_throw(DNSMessageFORMERR,
-                  "NSEC RDATA from wire too short: " << rdata_len << "bytes");
-    }
-    rdata_len -= (buffer.getPosition() - pos);
-
-    vector<uint8_t> typebits(rdata_len);
-    buffer.readData(&typebits[0], rdata_len);
-    checkRRTypeBitmaps("NSEC", typebits);
-
-    impl_ = new NSECImpl(nextname, typebits);
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual
-/// representation of an NSEC RDATA.
-///
-/// The Next Domain Name field can be non-absolute if \c origin is
-/// non-NULL, in which case \c origin is used to make it absolute.  It
-/// must not be represented as a quoted string.
-///
-/// The type mnemonics must be valid, and separated by whitespace. If
-/// any invalid mnemonics are found, InvalidRdataText exception is
-/// thrown.
-///
-/// \throw MasterLexer::LexerError General parsing error such as
-/// missing field.
-/// \throw MissingNameOrigin Thrown when the Next Domain Name is not
-/// absolute and \c origin is NULL.
-/// \throw InvalidRdataText if any fields are out of their valid range.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-/// \param origin The origin to use with a relative Next Domain Name
-/// field
-NSEC::NSEC(MasterLexer& lexer, const Name* origin, MasterLoader::Options,
-           MasterLoaderCallbacks&)
-{
-    const Name next_name(createNameFromLexer(lexer, origin));
-
-    vector<uint8_t> typebits;
-    buildBitmapsFromLexer("NSEC", lexer, typebits);
-
-    impl_ = new NSECImpl(next_name, typebits);
-}
-
-NSEC::NSEC(const NSEC& source) :
-    Rdata(), impl_(new NSECImpl(*source.impl_))
-{}
-
-NSEC&
-NSEC::operator=(const NSEC& source) {
-    if (this == &source) {
-        return (*this);
-    }
-
-    NSECImpl* newimpl = new NSECImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
-
-    return (*this);
-}
-
-NSEC::~NSEC() {
-    delete impl_;
-}
-
-string
-NSEC::toText() const {
-    ostringstream s;
-    s << impl_->nextname_;
-    bitmapsToText(impl_->typebits_, s);
-    return (s.str());
-}
-
-void
-NSEC::toWire(OutputBuffer& buffer) const {
-    impl_->nextname_.toWire(buffer);
-    buffer.writeData(&impl_->typebits_[0], impl_->typebits_.size());
-}
-
-void
-NSEC::toWire(AbstractMessageRenderer& renderer) const {
-    // Type NSEC is not "well-known", and name compression must be disabled
-    // per RFC3597.
-    renderer.writeName(impl_->nextname_, false);
-    renderer.writeData(&impl_->typebits_[0], impl_->typebits_.size());
-}
-
-const Name&
-NSEC::getNextName() const {
-    return (impl_->nextname_);
-}
-
-int
-NSEC::compare(const Rdata& other) const {
-    const NSEC& other_nsec = dynamic_cast<const NSEC&>(other);
-
-    int cmp = compareNames(impl_->nextname_, other_nsec.impl_->nextname_);
-    if (cmp != 0) {
-        return (cmp);
-    }
-
-    const size_t this_len = impl_->typebits_.size();
-    const size_t other_len = other_nsec.impl_->typebits_.size();
-    const size_t cmplen = min(this_len, other_len);
-    cmp = memcmp(&impl_->typebits_[0], &other_nsec.impl_->typebits_[0],
-                 cmplen);
-    if (cmp != 0) {
-        return (cmp);
-    } else {
-        return ((this_len == other_len) ? 0 : (this_len < other_len) ? -1 : 1);
-    }
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/nsec_47.h b/src/lib/dns/rdata/generic/nsec_47.h
deleted file mode 100644
index 299d381598..0000000000
--- a/src/lib/dns/rdata/generic/nsec_47.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <stdint.h>
-
-#include <string>
-
-#include <dns/name.h>
-#include <dns/rrtype.h>
-#include <dns/rrttl.h>
-#include <dns/rdata.h>
-
-// BEGIN_HEADER_GUARD
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-struct NSECImpl;
-
-class NSEC : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-    NSEC& operator=(const NSEC& source);
-    ~NSEC();
-
-    // specialized methods
-
-    /// Return the next domain name.
-    ///
-    /// \exception std::bad_alloc Resource allocation failure in name copy.
-    ///
-    /// \return The next domain name field in the form of \c Name object.
-    const Name& getNextName() const;
-
-private:
-    NSECImpl* impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/opt_41.cc b/src/lib/dns/rdata/generic/opt_41.cc
index 326ec383ab..c382955904 100644
--- a/src/lib/dns/rdata/generic/opt_41.cc
+++ b/src/lib/dns/rdata/generic/opt_41.cc
@@ -24,8 +24,7 @@ using namespace isc::util;
 OPT::PseudoRR::PseudoRR(uint16_t code,
                         boost::shared_ptr<std::vector<uint8_t> >& data) :
     code_(code),
-    data_(data)
-{
+    data_(data) {
 }
 
 uint16_t
@@ -45,8 +44,8 @@ OPT::PseudoRR::getLength() const {
 
 struct OPTImpl {
     OPTImpl() :
-        rdlength_(0)
-    {}
+        rdlength_(0) {
+    }
 
     uint16_t rdlength_;
     std::vector<OPT::PseudoRR> pseudo_rrs_;
@@ -54,8 +53,7 @@ struct OPTImpl {
 
 /// \brief Default constructor.
 OPT::OPT() :
-    impl_(new OPTImpl())
-{
+    impl_(new OPTImpl()) {
 }
 
 /// \brief Constructor from string.
@@ -64,8 +62,7 @@ OPT::OPT() :
 ///
 /// \throw InvalidRdataText OPT RR cannot be constructed from text.
 OPT::OPT(const std::string&) :
-    impl_(NULL)
-{
+    impl_(NULL) {
     isc_throw(InvalidRdataText, "OPT RR cannot be constructed from text");
 }
 
@@ -76,15 +73,13 @@ OPT::OPT(const std::string&) :
 /// \throw InvalidRdataText OPT RR cannot be constructed from text.
 OPT::OPT(MasterLexer&, const Name*,
          MasterLoader::Options, MasterLoaderCallbacks&) :
-    impl_(NULL)
-{
+    impl_(NULL) {
     isc_throw(InvalidRdataText, "OPT RR cannot be constructed from text");
 }
 
 OPT::OPT(InputBuffer& buffer, size_t rdata_len) :
-    impl_(NULL)
-{
-    std::unique_ptr<OPTImpl> impl_ptr(new OPTImpl());
+    impl_(NULL) {
+    boost::shared_ptr<OPTImpl> impl_ptr(new OPTImpl());
 
     while (true) {
         if (rdata_len == 0) {
@@ -102,8 +97,7 @@ OPT::OPT(InputBuffer& buffer, size_t rdata_len) :
         rdata_len -= 4;
 
         if (static_cast<uint16_t>(impl_ptr->rdlength_ + option_length) <
-            impl_ptr->rdlength_)
-        {
+            impl_ptr->rdlength_) {
             isc_throw(InvalidRdataText,
                       "Option length " << option_length
                       << " would overflow OPT RR RDLEN (currently "
@@ -122,12 +116,11 @@ OPT::OPT(InputBuffer& buffer, size_t rdata_len) :
         rdata_len -= option_length;
     }
 
-    impl_ = impl_ptr.release();
+    impl_ = impl_ptr;
 }
 
 OPT::OPT(const OPT& other) :
-    Rdata(), impl_(new OPTImpl(*other.impl_))
-{
+    Rdata(), impl_(new OPTImpl(*other.impl_)) {
 }
 
 OPT&
@@ -137,14 +130,12 @@ OPT::operator=(const OPT& source) {
     }
 
     OPTImpl* newimpl = new OPTImpl(*source.impl_);
-    delete impl_;
     impl_ = newimpl;
 
     return (*this);
 }
 
 OPT::~OPT() {
-    delete impl_;
 }
 
 std::string
@@ -191,8 +182,7 @@ OPT::appendPseudoRR(uint16_t code, const uint8_t* data, uint16_t length) {
     // pseudo-RR length here, not the whole message length (which should
     // be checked and enforced elsewhere).
     if (static_cast<uint16_t>(impl_->rdlength_ + length) <
-        impl_->rdlength_)
-    {
+        impl_->rdlength_) {
         isc_throw(isc::InvalidParameter,
                   "Option length " << length
                   << " would overflow OPT RR RDLEN (currently "
diff --git a/src/lib/dns/rdata/generic/opt_41.h b/src/lib/dns/rdata/generic/opt_41.h
index 0c00aed20c..e2d3ccb516 100644
--- a/src/lib/dns/rdata/generic/opt_41.h
+++ b/src/lib/dns/rdata/generic/opt_41.h
@@ -78,7 +78,7 @@ public:
     const std::vector<PseudoRR>& getPseudoRRs() const;
 
 private:
-    OPTImpl* impl_;
+    boost::shared_ptr<OPTImpl> impl_;
 };
 
 // END_RDATA_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/ptr_12.cc b/src/lib/dns/rdata/generic/ptr_12.cc
index b3596e8905..d33a6d8a45 100644
--- a/src/lib/dns/rdata/generic/ptr_12.cc
+++ b/src/lib/dns/rdata/generic/ptr_12.cc
@@ -39,8 +39,7 @@ using isc::dns::rdata::generic::detail::createNameFromLexer;
 /// \throw InvalidRdataText Other general syntax errors.
 PTR::PTR(const std::string& type_str) :
     // Fill in dummy name and replace them soon below.
-    ptr_name_(Name::ROOT_NAME())
-{
+    ptr_name_(Name::ROOT_NAME()) {
     try {
         std::istringstream ss(type_str);
         MasterLexer lexer;
@@ -59,8 +58,7 @@ PTR::PTR(const std::string& type_str) :
 }
 
 PTR::PTR(InputBuffer& buffer, size_t) :
-    ptr_name_(buffer)
-{
+    ptr_name_(buffer) {
     // we don't need rdata_len for parsing.  if necessary, the caller will
     // check consistency.
 }
@@ -83,12 +81,12 @@ PTR::PTR(InputBuffer& buffer, size_t) :
 /// is non-absolute.
 PTR::PTR(MasterLexer& lexer, const Name* origin,
          MasterLoader::Options, MasterLoaderCallbacks&) :
-    ptr_name_(createNameFromLexer(lexer, origin))
-{}
+    ptr_name_(createNameFromLexer(lexer, origin)) {
+}
 
 PTR::PTR(const PTR& source) :
-    Rdata(), ptr_name_(source.ptr_name_)
-{}
+    Rdata(), ptr_name_(source.ptr_name_) {
+}
 
 std::string
 PTR::toText() const {
@@ -111,7 +109,6 @@ PTR::compare(const Rdata& other) const {
     const PTR& other_ptr = dynamic_cast<const PTR&>(other);
 
     return (compareNames(ptr_name_, other_ptr.ptr_name_));
-
 }
 
 const Name&
diff --git a/src/lib/dns/rdata/generic/ptr_12.h b/src/lib/dns/rdata/generic/ptr_12.h
index e562ef7f11..101d60c263 100644
--- a/src/lib/dns/rdata/generic/ptr_12.h
+++ b/src/lib/dns/rdata/generic/ptr_12.h
@@ -26,7 +26,8 @@ public:
     ///
     /// Specialized constructor
     ///
-    explicit PTR(const Name& ptr_name) : ptr_name_(ptr_name) {}
+    explicit PTR(const Name& ptr_name) : ptr_name_(ptr_name) {
+    }
     ///
     /// Specialized methods
     ///
@@ -38,7 +39,3 @@ private:
 // END_RDATA_NAMESPACE
 // END_ISC_NAMESPACE
 // END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/rp_17.cc b/src/lib/dns/rdata/generic/rp_17.cc
deleted file mode 100644
index 43bf64761e..0000000000
--- a/src/lib/dns/rdata/generic/rp_17.cc
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <string>
-#include <sstream>
-
-#include <util/buffer.h>
-
-#include <dns/messagerenderer.h>
-#include <dns/name.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-#include <dns/rdata/generic/detail/lexer_util.h>
-
-using namespace std;
-using namespace isc::dns;
-using namespace isc::util;
-using isc::dns::rdata::generic::detail::createNameFromLexer;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-/// \brief Constructor from string.
-///
-/// \c rp_str must be formatted as follows:
-/// \code <mailbox name> <text name>
-/// \endcode
-/// where both fields must represent a valid domain name.
-///
-/// \throw InvalidRdataText The number of RDATA fields (must be 2) is
-/// incorrect.
-/// \throw std::bad_alloc Memory allocation for names fails.
-/// \throw Other The constructor of the \c Name class will throw if the
-/// given name is invalid.
-RP::RP(const std::string& rp_str) :
-    // We cannot construct both names in the initialization list due to the
-    // necessary text processing, so we have to initialize them with a dummy
-    // name and replace them later.
-    mailbox_(Name::ROOT_NAME()), text_(Name::ROOT_NAME())
-{
-    try {
-        std::istringstream ss(rp_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        mailbox_ = createNameFromLexer(lexer, NULL);
-        text_ = createNameFromLexer(lexer, NULL);
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText, "extra input text for RP: "
-                      << rp_str);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText, "Failed to construct RP from '" <<
-                  rp_str << "': " << ex.what());
-    }
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual representation
-/// of an RP RDATA.  The MAILBOX and TEXT fields can be non-absolute if \c
-/// origin is non-NULL, in which case \c origin is used to make them absolute.
-///
-/// \throw MasterLexer::LexerError General parsing error such as missing field.
-/// \throw Other Exceptions from the Name and constructors if construction of
-/// textual fields as these objects fail.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-/// \param origin If non NULL, specifies the origin of SERVER when it
-/// is non-absolute.
-RP::RP(MasterLexer& lexer, const Name* origin,
-       MasterLoader::Options, MasterLoaderCallbacks&) :
-    mailbox_(createNameFromLexer(lexer, origin)),
-    text_(createNameFromLexer(lexer, origin))
-{
-}
-
-/// \brief Constructor from wire-format data.
-///
-/// This constructor doesn't check the validity of the second parameter (rdata
-/// length) for parsing.
-/// If necessary, the caller will check consistency.
-///
-/// \throw std::bad_alloc Memory allocation for names fails.
-/// \throw Other The constructor of the \c Name class will throw if the
-/// names in the wire is invalid.
-RP::RP(InputBuffer& buffer, size_t) : mailbox_(buffer), text_(buffer) {
-}
-
-/// \brief Copy constructor.
-///
-/// \throw std::bad_alloc Memory allocation fails in copying internal
-/// member variables (this should be very rare).
-RP::RP(const RP& other) :
-    Rdata(), mailbox_(other.mailbox_), text_(other.text_)
-{}
-
-/// \brief Convert the \c RP to a string.
-///
-/// The output of this method is formatted as described in the "from string"
-/// constructor (\c RP(const std::string&))).
-///
-/// \throw std::bad_alloc Internal resource allocation fails.
-///
-/// \return A \c string object that represents the \c RP object.
-std::string
-RP::toText() const {
-    return (mailbox_.toText() + " " + text_.toText());
-}
-
-/// \brief Render the \c RP in the wire format without name compression.
-///
-/// \throw std::bad_alloc Internal resource allocation fails.
-///
-/// \param buffer An output buffer to store the wire data.
-void
-RP::toWire(OutputBuffer& buffer) const {
-    mailbox_.toWire(buffer);
-    text_.toWire(buffer);
-}
-
-/// \brief Render the \c RP in the wire format with taking into account
-/// compression.
-///
-// Type RP is not "well-known", and name compression must be disabled
-// per RFC3597.
-///
-/// \throw std::bad_alloc Internal resource allocation fails.
-///
-/// \param renderer DNS message rendering context that encapsulates the
-/// output buffer and name compression information.
-void
-RP::toWire(AbstractMessageRenderer& renderer) const {
-    renderer.writeName(mailbox_, false);
-    renderer.writeName(text_, false);
-}
-
-/// \brief Compare two instances of \c RP RDATA.
-///
-/// See documentation in \c Rdata.
-int
-RP::compare(const Rdata& other) const {
-    const RP& other_rp = dynamic_cast<const RP&>(other);
-
-    const int cmp = compareNames(mailbox_, other_rp.mailbox_);
-    if (cmp != 0) {
-        return (cmp);
-    }
-    return (compareNames(text_, other_rp.text_));
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/rp_17.h b/src/lib/dns/rdata/generic/rp_17.h
deleted file mode 100644
index 9536ee9cff..0000000000
--- a/src/lib/dns/rdata/generic/rp_17.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <string>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-/// \brief \c rdata::generic::RP class represents the RP RDATA as defined in
-/// RFC1183.
-///
-/// This class implements the basic interfaces inherited from the abstract
-/// \c rdata::Rdata class, and provides trivial accessors specific to the
-/// RP RDATA.
-class RP : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    /// We use the default copy constructor and assignment operator.
-
-    /// \brief Constructor from RDATA field parameters.
-    ///
-    /// The parameters are a straightforward mapping of %RP RDATA
-    /// fields as defined in RFC1183.
-    RP(const Name& mailbox, const Name& text) :
-        mailbox_(mailbox), text_(text)
-    {}
-
-    /// \brief Return the value of the mailbox field.
-    ///
-    /// \throw std::bad_alloc If resource allocation for the returned
-    /// \c Name fails.
-    ///
-    /// \note
-    /// Unlike the case of some other RDATA classes (such as
-    /// \c NS::getNSName()), this method constructs a new \c Name object
-    /// and returns it, instead of returning a reference to a \c Name object
-    /// internally maintained in the class (which is a private member).
-    /// This is based on the observation that this method will be rarely used
-    /// and even when it's used it will not be in a performance context
-    /// (for example, a recursive resolver won't need this field in its
-    /// resolution process).  By returning a new object we have flexibility of
-    /// changing the internal representation without the risk of changing
-    /// the interface or method property.
-    /// The same note applies to the \c getText() method.
-    Name getMailbox() const { return (mailbox_); }
-
-    /// \brief Return the value of the text field.
-    ///
-    /// \throw std::bad_alloc If resource allocation for the returned
-    /// \c Name fails.
-    Name getText() const { return (text_); }
-
-private:
-    Name mailbox_;
-    Name text_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/rrsig_46.cc b/src/lib/dns/rdata/generic/rrsig_46.cc
index c9f91a7b9f..94d62f5e16 100644
--- a/src/lib/dns/rdata/generic/rrsig_46.cc
+++ b/src/lib/dns/rdata/generic/rrsig_46.cc
@@ -53,8 +53,8 @@ struct RRSIGImpl {
         covered_(covered), algorithm_(algorithm), labels_(labels),
         originalttl_(originalttl), timeexpire_(timeexpire),
         timeinception_(timeinception), tag_(tag), signer_(signer),
-        signature_(signature)
-    {}
+        signature_(signature) {
+    }
 
     const RRType covered_;
     uint8_t algorithm_;
@@ -68,7 +68,7 @@ struct RRSIGImpl {
 };
 
 // helper function for string and lexer constructors
-RRSIGImpl*
+boost::shared_ptr<RRSIGImpl>
 RRSIG::constructFromLexer(MasterLexer& lexer, const Name* origin) {
     const RRType covered(lexer.getNextToken(MasterToken::STRING).getString());
     const uint32_t algorithm =
@@ -115,9 +115,9 @@ RRSIG::constructFromLexer(MasterLexer& lexer, const Name* origin) {
         decodeBase64(signature_txt, signature);
     }
 
-    return (new RRSIGImpl(covered, algorithm, labels,
-                          originalttl, timeexpire, timeinception,
-                          static_cast<uint16_t>(tag), signer, signature));
+    return (boost::shared_ptr<RRSIGImpl>(new RRSIGImpl(covered, algorithm, labels,
+                                                       originalttl, timeexpire, timeinception,
+                                                       static_cast<uint16_t>(tag), signer, signature)));
 }
 
 /// \brief Constructor from string.
@@ -137,12 +137,11 @@ RRSIG::constructFromLexer(MasterLexer& lexer, const Name* origin) {
 /// \throw Others Exception from the Name constructor.
 /// \throw InvalidRdataText Other general syntax errors.
 RRSIG::RRSIG(const std::string& rrsig_str) :
-    impl_(NULL)
-{
+    impl_(NULL) {
     // We use unique_ptr here because if there is an exception in this
     // constructor, the destructor is not called and there could be a
     // leak of the RRSIGImpl that constructFromLexer() returns.
-    std::unique_ptr<RRSIGImpl> impl_ptr;
+    boost::shared_ptr<RRSIGImpl> impl_ptr;
 
     try {
         std::istringstream iss(rrsig_str);
@@ -160,7 +159,7 @@ RRSIG::RRSIG(const std::string& rrsig_str) :
                   rrsig_str << "': " << ex.what());
     }
 
-    impl_ = impl_ptr.release();
+    impl_ = impl_ptr;
 }
 
 /// \brief Constructor with a context of MasterLexer.
@@ -184,8 +183,7 @@ RRSIG::RRSIG(const std::string& rrsig_str) :
 /// it is non absolute.
 RRSIG::RRSIG(MasterLexer& lexer, const Name* origin,
              MasterLoader::Options, MasterLoaderCallbacks&) :
-    impl_(constructFromLexer(lexer, origin))
-{
+    impl_(constructFromLexer(lexer, origin)) {
 }
 
 RRSIG::RRSIG(InputBuffer& buffer, size_t rdata_len) {
@@ -213,14 +211,14 @@ RRSIG::RRSIG(InputBuffer& buffer, size_t rdata_len) {
     vector<uint8_t> signature(rdata_len);
     buffer.readData(&signature[0], rdata_len);
 
-    impl_ = new RRSIGImpl(covered, algorithm, labels,
-                          originalttl, timeexpire, timeinception, tag,
-                          signer, signature);
+    impl_.reset(new RRSIGImpl(covered, algorithm, labels,
+                              originalttl, timeexpire, timeinception, tag,
+                              signer, signature));
 }
 
 RRSIG::RRSIG(const RRSIG& source) :
-    Rdata(), impl_(new RRSIGImpl(*source.impl_))
-{}
+    Rdata(), impl_(new RRSIGImpl(*source.impl_)) {
+}
 
 RRSIG&
 RRSIG::operator=(const RRSIG& source) {
@@ -228,15 +226,12 @@ RRSIG::operator=(const RRSIG& source) {
         return (*this);
     }
 
-    RRSIGImpl* newimpl = new RRSIGImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
+    impl_.reset(new RRSIGImpl(*source.impl_));
 
     return (*this);
 }
 
 RRSIG::~RRSIG() {
-    delete impl_;
 }
 
 string
diff --git a/src/lib/dns/rdata/generic/rrsig_46.h b/src/lib/dns/rdata/generic/rrsig_46.h
index aca26bacab..8443ad79e8 100644
--- a/src/lib/dns/rdata/generic/rrsig_46.h
+++ b/src/lib/dns/rdata/generic/rrsig_46.h
@@ -11,6 +11,7 @@
 #include <dns/name.h>
 #include <dns/rrtype.h>
 #include <dns/rdata.h>
+#include <boost/shared_ptr.hpp>
 
 // BEGIN_HEADER_GUARD
 
@@ -40,15 +41,11 @@ public:
     const RRType& typeCovered() const;
 private:
     // helper function for string and lexer constructors
-    RRSIGImpl* constructFromLexer(MasterLexer& lexer, const Name* origin);
+    boost::shared_ptr<RRSIGImpl> constructFromLexer(MasterLexer& lexer, const Name* origin);
 
-    RRSIGImpl* impl_;
+    boost::shared_ptr<RRSIGImpl> impl_;
 };
 
 // END_RDATA_NAMESPACE
 // END_ISC_NAMESPACE
 // END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/soa_6.cc b/src/lib/dns/rdata/generic/soa_6.cc
index ee4e43d48d..945d4b99cd 100644
--- a/src/lib/dns/rdata/generic/soa_6.cc
+++ b/src/lib/dns/rdata/generic/soa_6.cc
@@ -34,8 +34,7 @@ using isc::dns::rdata::generic::detail::createNameFromLexer;
 // BEGIN_RDATA_NAMESPACE
 
 SOA::SOA(InputBuffer& buffer, size_t) :
-    mname_(buffer), rname_(buffer)
-{
+    mname_(buffer), rname_(buffer) {
     // we don't need rdata_len for parsing.  if necessary, the caller will
     // check consistency.
     buffer.readData(numdata_, sizeof(numdata_));
@@ -74,8 +73,7 @@ fillParameters(MasterLexer& lexer, uint8_t numdata[20]) {
 /// \throw InvalidRdataText Other general syntax errors.
 SOA::SOA(const std::string& soastr) :
     // Fill in dummy name and replace them soon below.
-    mname_(Name::ROOT_NAME()), rname_(Name::ROOT_NAME())
-{
+    mname_(Name::ROOT_NAME()), rname_(Name::ROOT_NAME()) {
     try {
         std::istringstream ss(soastr);
         MasterLexer lexer;
@@ -117,15 +115,13 @@ SOA::SOA(const std::string& soastr) :
 SOA::SOA(MasterLexer& lexer, const Name* origin,
          MasterLoader::Options, MasterLoaderCallbacks&) :
     mname_(createNameFromLexer(lexer, origin)),
-    rname_(createNameFromLexer(lexer, origin))
-{
+    rname_(createNameFromLexer(lexer, origin)) {
     fillParameters(lexer, numdata_);
 }
 
 SOA::SOA(const Name& mname, const Name& rname, uint32_t serial,
          uint32_t refresh, uint32_t retry, uint32_t expire, uint32_t minimum) :
-    mname_(mname), rname_(rname)
-{
+    mname_(mname), rname_(rname) {
     OutputBuffer b(20);
     b.writeUint32(serial);
     b.writeUint32(refresh);
@@ -137,8 +133,7 @@ SOA::SOA(const Name& mname, const Name& rname, uint32_t serial,
 }
 
 SOA::SOA(const SOA& other) :
-    Rdata(), mname_(other.mname_), rname_(other.rname_)
-{
+    Rdata(), mname_(other.mname_), rname_(other.rname_) {
     memcpy(numdata_, other.numdata_, sizeof(numdata_));
 }
 
diff --git a/src/lib/dns/rdata/generic/soa_6.h b/src/lib/dns/rdata/generic/soa_6.h
index 50a062eb45..509663311f 100644
--- a/src/lib/dns/rdata/generic/soa_6.h
+++ b/src/lib/dns/rdata/generic/soa_6.h
@@ -10,6 +10,7 @@
 
 #include <dns/name.h>
 #include <dns/rdata.h>
+#include <dns/rrttl.h>
 #include <dns/serial.h>
 
 // BEGIN_ISC_NAMESPACE
@@ -45,7 +46,3 @@ private:
 // END_RDATA_NAMESPACE
 // END_ISC_NAMESPACE
 // END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/spf_99.cc b/src/lib/dns/rdata/generic/spf_99.cc
deleted file mode 100644
index f25585ab53..0000000000
--- a/src/lib/dns/rdata/generic/spf_99.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <stdint.h>
-#include <string.h>
-
-#include <string>
-#include <vector>
-
-#include <util/buffer.h>
-#include <dns/exceptions.h>
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-/// This class implements the basic interfaces inherited from the abstract
-/// \c rdata::Rdata class. The semantics of the class is provided by
-/// a copy of instantiated TXTLikeImpl class common to both TXT and SPF.
-#include <dns/rdata/generic/detail/txt_like.h>
-
-using namespace std;
-using namespace isc::util;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-/// \brief The assignment operator
-///
-/// It internally allocates a resource, and if it fails a corresponding
-/// standard exception will be thrown.
-/// This method never throws an exception otherwise.
-SPF&
-SPF::operator=(const SPF& source) {
-    if (this == &source) {
-        return (*this);
-    }
-
-    SPFImpl* newimpl = new SPFImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
-
-    return (*this);
-}
-
-/// \brief The destructor
-SPF::~SPF() {
-    delete impl_;
-}
-
-/// \brief Constructor from wire-format data.
-///
-/// It internally allocates a resource, and if it fails a corresponding
-/// standard exception will be thrown.
-SPF::SPF(InputBuffer& buffer, size_t rdata_len) :
-    impl_(new SPFImpl(buffer, rdata_len))
-{}
-
-/// \brief Constructor using the master lexer.
-///
-/// This implementation only uses the \c lexer parameters; others are
-/// ignored.
-///
-/// \throw CharStringTooLong the parameter string length exceeds maximum.
-/// \throw InvalidRdataText the method cannot process the parameter data
-///
-/// \param lexer A \c MasterLexer object parsing a master file for this
-/// RDATA.
-SPF::SPF(MasterLexer& lexer, const Name*, MasterLoader::Options,
-         MasterLoaderCallbacks&) :
-    impl_(new SPFImpl(lexer))
-{}
-
-/// \brief Constructor from string.
-///
-/// It internally allocates a resource, and if it fails a corresponding
-/// standard exception will be thrown.
-SPF::SPF(const std::string& txtstr) :
-    impl_(new SPFImpl(txtstr))
-{}
-
-/// \brief Copy constructor
-///
-/// It internally allocates a resource, and if it fails a corresponding
-/// standard exception will be thrown.
-SPF::SPF(const SPF& other) :
-    Rdata(), impl_(new SPFImpl(*other.impl_))
-{}
-
-/// \brief Render the \c SPF in the wire format to a OutputBuffer object
-///
-/// \return is the return of the corresponding implementation method.
-void
-SPF::toWire(OutputBuffer& buffer) const {
-    impl_->toWire(buffer);
-}
-
-/// \brief Render the \c SPF in the wire format to an AbstractMessageRenderer
-/// object
-///
-/// \return is the return of the corresponding implementation method.
-void
-SPF::toWire(AbstractMessageRenderer& renderer) const {
-    impl_->toWire(renderer);
-}
-
-/// \brief Convert the \c SPF to a string.
-///
-/// \return is the return of the corresponding implementation method.
-string
-SPF::toText() const {
-    return (impl_->toText());
-}
-
-/// \brief Compare two instances of \c SPF RDATA.
-///
-/// This method compares \c this and the \c other \c SPF objects.
-///
-/// This method is expected to be used in a polymorphic way, and the
-/// parameter to compare against is therefore of the abstract \c Rdata class.
-/// However, comparing two \c Rdata objects of different RR types
-/// is meaningless, and \c other must point to a \c SPF object;
-/// otherwise, the standard \c bad_cast exception will be thrown.
-///
-/// \param other the right-hand operand to compare against.
-/// \return is the return of the corresponding implementation method.
-int
-SPF::compare(const Rdata& other) const {
-    const SPF& other_txt = dynamic_cast<const SPF&>(other);
-
-    return (impl_->compare(*other_txt.impl_));
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/spf_99.h b/src/lib/dns/rdata/generic/spf_99.h
deleted file mode 100644
index 3a84d9deb8..0000000000
--- a/src/lib/dns/rdata/generic/spf_99.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <stdint.h>
-
-#include <string>
-#include <vector>
-
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-namespace detail {
-template<class Type, uint16_t typeCode> class TXTLikeImpl;
-}
-
-/// \brief \c rdata::SPF class represents the SPF RDATA as defined %in
-/// RFC4408.
-///
-/// This class implements the basic interfaces inherited from the abstract
-/// \c rdata::Rdata class. The semantics of the class is provided by
-/// a copy of instantiated TXTLikeImpl class common to both TXT and SPF.
-class SPF : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    /// \brief Assignment operator.
-    ///
-    /// It internally allocates a resource, and if it fails a corresponding
-    /// standard exception will be thrown.
-    /// This operator never throws an exception otherwise.
-    ///
-    /// This operator provides the strong exception guarantee: When an
-    /// exception is thrown the content of the assignment target will be
-    /// intact.
-    SPF& operator=(const SPF& source);
-
-    /// \brief The destructor.
-    ~SPF();
-
-    ///
-    /// Specialized methods
-    ///
-
-    /// \brief Return a reference to the data strings
-    ///
-    /// This method never throws an exception.
-    const std::vector<std::vector<uint8_t> >& getString() const;
-
-private:
-    typedef isc::dns::rdata::generic::detail::TXTLikeImpl<SPF, 99> SPFImpl;
-    SPFImpl* impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: 
diff --git a/src/lib/dns/rdata/generic/sshfp_44.cc b/src/lib/dns/rdata/generic/sshfp_44.cc
deleted file mode 100644
index 168e631643..0000000000
--- a/src/lib/dns/rdata/generic/sshfp_44.cc
+++ /dev/null
@@ -1,298 +0,0 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <boost/lexical_cast.hpp>
-
-#include <exceptions/exceptions.h>
-
-#include <util/buffer.h>
-#include <util/encode/encode.h>
-#include <dns/name.h>
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-
-using namespace std;
-using boost::lexical_cast;
-using namespace isc::util;
-using namespace isc::util::encode;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-struct SSHFPImpl {
-    // straightforward representation of SSHFP RDATA fields
-    SSHFPImpl(uint8_t algorithm, uint8_t fingerprint_type,
-              const vector<uint8_t>& fingerprint) :
-        algorithm_(algorithm),
-        fingerprint_type_(fingerprint_type),
-        fingerprint_(fingerprint)
-    {}
-
-    uint8_t algorithm_;
-    uint8_t fingerprint_type_;
-    const vector<uint8_t> fingerprint_;
-};
-
-// helper function for string and lexer constructors
-SSHFPImpl*
-SSHFP::constructFromLexer(MasterLexer& lexer) {
-    const uint32_t algorithm =
-        lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (algorithm > 255) {
-        isc_throw(InvalidRdataText, "SSHFP algorithm number out of range");
-    }
-
-    const uint32_t fingerprint_type =
-        lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (fingerprint_type > 255) {
-        isc_throw(InvalidRdataText, "SSHFP fingerprint type out of range");
-    }
-
-    std::string fingerprint_str;
-    std::string fingerprint_substr;
-    while (true) {
-        const MasterToken& token =
-            lexer.getNextToken(MasterToken::STRING, true);
-        if ((token.getType() == MasterToken::END_OF_FILE) ||
-            (token.getType() == MasterToken::END_OF_LINE)) {
-            break;
-        }
-        token.getString(fingerprint_substr);
-        fingerprint_str.append(fingerprint_substr);
-    }
-    lexer.ungetToken();
-
-    vector<uint8_t> fingerprint;
-    // If fingerprint is missing, it's OK. See the API documentation of the
-    // constructor.
-    if (fingerprint_str.size() > 0) {
-        try {
-            decodeHex(fingerprint_str, fingerprint);
-        } catch (const isc::BadValue& e) {
-            isc_throw(InvalidRdataText, "Bad SSHFP fingerprint: " << e.what());
-        }
-    }
-
-    return (new SSHFPImpl(algorithm, fingerprint_type, fingerprint));
-}
-
-/// \brief Constructor from string.
-///
-/// The given string must represent a valid SSHFP RDATA.  There can be
-/// extra space characters at the beginning or end of the text (which
-/// are simply ignored), but other extra text, including a new line,
-/// will make the construction fail with an exception.
-///
-/// The Algorithm and Fingerprint Type fields must be within their valid
-/// ranges, but are not constrained to the values defined in RFC4255.
-///
-/// The Fingerprint field may be absent, but if present it must contain a
-/// valid hex encoding of the fingerprint. For compatibility with BIND 9,
-/// whitespace is allowed in the hex text (RFC4255 is silent on the matter).
-///
-/// \throw InvalidRdataText if any fields are missing, are out of their
-/// valid ranges or are incorrect, or if the fingerprint is not a valid
-/// hex string.
-///
-/// \param sshfp_str A string containing the RDATA to be created
-SSHFP::SSHFP(const string& sshfp_str) :
-    impl_(NULL)
-{
-    // We use unique_ptr here because if there is an exception in this
-    // constructor, the destructor is not called and there could be a
-    // leak of the SSHFPImpl that constructFromLexer() returns.
-    std::unique_ptr<SSHFPImpl> impl_ptr;
-
-    try {
-        std::istringstream ss(sshfp_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        impl_ptr.reset(constructFromLexer(lexer));
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText, "extra input text for SSHFP: "
-                      << sshfp_str);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText, "Failed to construct SSHFP from '" <<
-                  sshfp_str << "': " << ex.what());
-    }
-
-    impl_ = impl_ptr.release();
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual representation
-/// of an SSHFP RDATA.
-///
-/// \throw MasterLexer::LexerError General parsing error such as missing field.
-/// \throw InvalidRdataText Fields are out of their valid range or are
-/// incorrect, or if the fingerprint is not a valid hex string.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-SSHFP::SSHFP(MasterLexer& lexer, const Name*,
-             MasterLoader::Options, MasterLoaderCallbacks&) :
-    impl_(constructFromLexer(lexer))
-{
-}
-
-/// \brief Constructor from InputBuffer.
-///
-/// The passed buffer must contain a valid SSHFP RDATA.
-///
-/// The Algorithm and Fingerprint Type fields are not checked for unknown
-/// values.  It is okay for the fingerprint data to be missing (see the
-/// description of the constructor from string).
-SSHFP::SSHFP(InputBuffer& buffer, size_t rdata_len) {
-    if (rdata_len < 2) {
-        isc_throw(InvalidRdataLength, "SSHFP record too short");
-    }
-
-    const uint8_t algorithm = buffer.readUint8();
-    const uint8_t fingerprint_type = buffer.readUint8();
-
-    vector<uint8_t> fingerprint;
-    rdata_len -= 2;
-    if (rdata_len > 0) {
-        fingerprint.resize(rdata_len);
-        buffer.readData(&fingerprint[0], rdata_len);
-    }
-
-    impl_ = new SSHFPImpl(algorithm, fingerprint_type, fingerprint);
-}
-
-SSHFP::SSHFP(uint8_t algorithm, uint8_t fingerprint_type,
-             const string& fingerprint_txt) :
-    impl_(NULL)
-{
-    vector<uint8_t> fingerprint;
-    try {
-        decodeHex(fingerprint_txt, fingerprint);
-    } catch (const isc::BadValue& e) {
-        isc_throw(InvalidRdataText, "Bad SSHFP fingerprint: " << e.what());
-    }
-
-    impl_ = new SSHFPImpl(algorithm, fingerprint_type, fingerprint);
-}
-
-SSHFP::SSHFP(const SSHFP& other) :
-        Rdata(), impl_(new SSHFPImpl(*other.impl_))
-{}
-
-SSHFP&
-SSHFP::operator=(const SSHFP& source) {
-    if (this == &source) {
-        return (*this);
-    }
-
-    SSHFPImpl* newimpl = new SSHFPImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
-
-    return (*this);
-}
-
-SSHFP::~SSHFP() {
-    delete impl_;
-}
-
-void
-SSHFP::toWire(OutputBuffer& buffer) const {
-    buffer.writeUint8(impl_->algorithm_);
-    buffer.writeUint8(impl_->fingerprint_type_);
-
-    if (!impl_->fingerprint_.empty()) {
-        buffer.writeData(&impl_->fingerprint_[0],
-                         impl_->fingerprint_.size());
-    }
-}
-
-void
-SSHFP::toWire(AbstractMessageRenderer& renderer) const {
-    renderer.writeUint8(impl_->algorithm_);
-    renderer.writeUint8(impl_->fingerprint_type_);
-
-    if (!impl_->fingerprint_.empty()) {
-        renderer.writeData(&impl_->fingerprint_[0],
-                           impl_->fingerprint_.size());
-    }
-}
-
-string
-SSHFP::toText() const {
-    return (lexical_cast<string>(static_cast<int>(impl_->algorithm_)) + " " +
-            lexical_cast<string>(static_cast<int>(impl_->fingerprint_type_)) +
-            (impl_->fingerprint_.empty() ? "" :
-             " " + encodeHex(impl_->fingerprint_)));
-}
-
-int
-SSHFP::compare(const Rdata& other) const {
-    const SSHFP& other_sshfp = dynamic_cast<const SSHFP&>(other);
-
-    if (impl_->algorithm_ < other_sshfp.impl_->algorithm_) {
-        return (-1);
-    } else if (impl_->algorithm_ > other_sshfp.impl_->algorithm_) {
-        return (1);
-    }
-
-    if (impl_->fingerprint_type_ < other_sshfp.impl_->fingerprint_type_) {
-        return (-1);
-    } else if (impl_->fingerprint_type_ >
-               other_sshfp.impl_->fingerprint_type_) {
-        return (1);
-    }
-
-    const size_t this_len = impl_->fingerprint_.size();
-    const size_t other_len = other_sshfp.impl_->fingerprint_.size();
-    const size_t cmplen = min(this_len, other_len);
-
-    if (cmplen > 0) {
-        const int cmp = memcmp(&impl_->fingerprint_[0],
-                               &other_sshfp.impl_->fingerprint_[0],
-                               cmplen);
-        if (cmp != 0) {
-            return (cmp);
-        }
-    }
-
-    if (this_len == other_len) {
-        return (0);
-    } else if (this_len < other_len) {
-        return (-1);
-    } else {
-        return (1);
-    }
-}
-
-uint8_t
-SSHFP::getAlgorithmNumber() const {
-    return (impl_->algorithm_);
-}
-
-uint8_t
-SSHFP::getFingerprintType() const {
-    return (impl_->fingerprint_type_);
-}
-
-const std::vector<uint8_t>&
-SSHFP::getFingerprint() const {
-    return (impl_->fingerprint_);
-}
-
-size_t
-SSHFP::getFingerprintLength() const {
-    return (impl_->fingerprint_.size());
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/sshfp_44.h b/src/lib/dns/rdata/generic/sshfp_44.h
deleted file mode 100644
index 4eae696bdc..0000000000
--- a/src/lib/dns/rdata/generic/sshfp_44.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <stdint.h>
-
-#include <string>
-#include <vector>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-struct SSHFPImpl;
-
-class SSHFP : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    SSHFP(uint8_t algorithm, uint8_t fingerprint_type,
-          const std::string& fingerprint);
-    SSHFP& operator=(const SSHFP& source);
-    ~SSHFP();
-
-    ///
-    /// Specialized methods
-    ///
-    uint8_t getAlgorithmNumber() const;
-    uint8_t getFingerprintType() const;
-    const std::vector<uint8_t>& getFingerprint() const;
-    size_t getFingerprintLength() const;
-
-private:
-    SSHFPImpl* constructFromLexer(MasterLexer& lexer);
-
-    SSHFPImpl* impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/tkey_249.cc b/src/lib/dns/rdata/generic/tkey_249.cc
index 7952065440..d12e2c6295 100644
--- a/src/lib/dns/rdata/generic/tkey_249.cc
+++ b/src/lib/dns/rdata/generic/tkey_249.cc
@@ -16,6 +16,7 @@
 #include <util/encode/encode.h>
 #include <util/time_utilities.h>
 
+#include <dns/tsigerror.h>
 #include <dns/messagerenderer.h>
 #include <dns/name.h>
 #include <dns/rdata.h>
@@ -50,8 +51,8 @@ struct TKEYImpl {
              uint16_t mode, uint16_t error, vector<uint8_t>& key,
              vector<uint8_t>& other_data) :
       algorithm_(algorithm), inception_(inception), expire_(expire),
-      mode_(mode), error_(error), key_(key), other_data_(other_data)
-    {}
+      mode_(mode), error_(error), key_(key), other_data_(other_data) {
+    }
 
     /// \brief Constructor from RDATA field parameters.
     ///
@@ -77,8 +78,8 @@ struct TKEYImpl {
                     vector<uint8_t>(static_cast<const uint8_t*>(other_data),
                                     static_cast<const uint8_t*>(other_data) +
                                     other_len) :
-                    vector<uint8_t>(other_len))
-    {}
+                    vector<uint8_t>(other_len)) {
+    }
 
     /// \brief Common part of toWire methods.
     /// \tparam Output \c OutputBuffer or \c AbstractMessageRenderer.
@@ -108,7 +109,7 @@ struct TKEYImpl {
 };
 
 // helper function for string and lexer constructors
-TKEYImpl*
+boost::shared_ptr<TKEYImpl>
 TKEY::constructFromLexer(MasterLexer& lexer, const Name* origin) {
     const Name& algorithm =
         createNameFromLexer(lexer, origin ? origin : &Name::ROOT_NAME());
@@ -203,8 +204,8 @@ TKEY::constructFromLexer(MasterLexer& lexer, const Name* origin) {
     // RFC2845 says Other Data is "empty unless Error == BADTIME".
     // However, we don't enforce that.
 
-    return (new TKEYImpl(algorithm, inception, expire, mode, error,
-                         key_data, other_data));
+    return (new boost::shared_ptr<TKEYImpl>(algorithm, inception, expire, mode, error,
+                                            key_data, other_data));
 }
 
 /// \brief Constructor from string.
@@ -263,7 +264,7 @@ TKEY::TKEY(const std::string& tkey_str) : impl_(0) {
     // We use unique_ptr here because if there is an exception in this
     // constructor, the destructor is not called and there could be a
     // leak of the TKEYImpl that constructFromLexer() returns.
-    std::unique_ptr<TKEYImpl> impl_ptr;
+    boost::shared_ptr<TKEYImpl> impl_ptr;
 
     try {
         std::istringstream ss(tkey_str);
@@ -282,7 +283,7 @@ TKEY::TKEY(const std::string& tkey_str) : impl_(0) {
                   << ex.what());
     }
 
-    impl_ = impl_ptr.release();
+    impl_ = impl_ptr;
 }
 
 /// \brief Constructor with a context of MasterLexer.
@@ -302,8 +303,7 @@ TKEY::TKEY(const std::string& tkey_str) : impl_(0) {
 /// RDATA to be created
 TKEY::TKEY(MasterLexer& lexer, const Name* origin,
            MasterLoader::Options, MasterLoaderCallbacks&) :
-    impl_(constructFromLexer(lexer, origin))
-{
+    impl_(constructFromLexer(lexer, origin)) {
 }
 
 /// \brief Constructor from wire-format data.
@@ -327,8 +327,7 @@ TKEY::TKEY(MasterLexer& lexer, const Name* origin,
 /// must check consistency between the length parameter and the actual
 /// RDATA length.
 TKEY::TKEY(InputBuffer& buffer, size_t) :
-    impl_(0)
-{
+    impl_(0) {
     Name algorithm(buffer);
 
     const uint32_t inception = buffer.readUint32();
@@ -351,15 +350,14 @@ TKEY::TKEY(InputBuffer& buffer, size_t) :
         buffer.readData(&other_data[0], other_len);
     }
 
-    impl_ = new TKEYImpl(algorithm, inception, expire, mode, error,
-                         key, other_data);
+    impl_.reset(new TKEYImpl(algorithm, inception, expire, mode, error,
+                             key, other_data));
 }
 
 TKEY::TKEY(const Name& algorithm, uint32_t inception, uint32_t expire,
            uint16_t mode, uint16_t error, uint16_t key_len,
            const void* key, uint16_t other_len, const void* other_data) :
-    impl_(0)
-{
+    impl_(0) {
     if ((key_len == 0 && key != 0) || (key_len > 0 && key == 0)) {
         isc_throw(InvalidParameter, "TKEY Key length and data inconsistent");
     }
@@ -368,8 +366,8 @@ TKEY::TKEY(const Name& algorithm, uint32_t inception, uint32_t expire,
         isc_throw(InvalidParameter,
                   "TKEY Other data length and data inconsistent");
     }
-    impl_ = new TKEYImpl(algorithm, inception, expire, mode, error,
-                         key_len, key, other_len, other_data);
+    impl_.reset(new TKEYImpl(algorithm, inception, expire, mode, error,
+                             key_len, key, other_len, other_data));
 }
 
 /// \brief The copy constructor.
@@ -377,8 +375,8 @@ TKEY::TKEY(const Name& algorithm, uint32_t inception, uint32_t expire,
 /// It internally allocates a resource, and if it fails a corresponding
 /// standard exception will be thrown.
 /// This constructor never throws an exception otherwise.
-TKEY::TKEY(const TKEY& source) : Rdata(), impl_(new TKEYImpl(*source.impl_))
-{}
+TKEY::TKEY(const TKEY& source) : Rdata(), impl_(new TKEYImpl(*source.impl_)) {
+}
 
 TKEY&
 TKEY::operator=(const TKEY& source) {
@@ -386,15 +384,12 @@ TKEY::operator=(const TKEY& source) {
         return (*this);
     }
 
-    TKEYImpl* newimpl = new TKEYImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
+    impl_.reset(new TKEYImpl(*source.impl_));
 
     return (*this);
 }
 
 TKEY::~TKEY() {
-    delete impl_;
 }
 
 /// \brief Convert the \c TKEY to a string.
diff --git a/src/lib/dns/rdata/generic/tkey_249.h b/src/lib/dns/rdata/generic/tkey_249.h
index d63012132d..cd7278d374 100644
--- a/src/lib/dns/rdata/generic/tkey_249.h
+++ b/src/lib/dns/rdata/generic/tkey_249.h
@@ -12,6 +12,7 @@
 
 #include <dns/name.h>
 #include <dns/rdata.h>
+#include <boost/shared_ptr.hpp>
 
 // BEGIN_ISC_NAMESPACE
 
@@ -128,15 +129,11 @@ public:
     static const uint16_t GSS_API_MODE;
 
 private:
-    TKEYImpl* constructFromLexer(MasterLexer& lexer, const Name* origin);
+    boost::shared_ptr<TKEYImpl> constructFromLexer(MasterLexer& lexer, const Name* origin);
 
-    TKEYImpl* impl_;
+    boost::shared_ptr<TKEYImpl> impl_;
 };
 
 // END_RDATA_NAMESPACE
 // END_ISC_NAMESPACE
 // END_HEADER_GUARD
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/tlsa_52.cc b/src/lib/dns/rdata/generic/tlsa_52.cc
deleted file mode 100644
index c05ef16518..0000000000
--- a/src/lib/dns/rdata/generic/tlsa_52.cc
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <boost/lexical_cast.hpp>
-
-#include <exceptions/exceptions.h>
-
-#include <util/buffer.h>
-#include <util/encode/encode.h>
-#include <dns/name.h>
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-#include <dns/rdata_pimpl_holder.h>
-
-using namespace std;
-using boost::lexical_cast;
-using namespace isc::util;
-using namespace isc::util::encode;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-struct TLSAImpl {
-    // straightforward representation of TLSA RDATA fields
-    TLSAImpl(uint8_t certificate_usage, uint8_t selector,
-             uint8_t matching_type, const vector<uint8_t>& data) :
-        certificate_usage_(certificate_usage),
-        selector_(selector),
-        matching_type_(matching_type),
-        data_(data)
-    {}
-
-    uint8_t certificate_usage_;
-    uint8_t selector_;
-    uint8_t matching_type_;
-    const vector<uint8_t> data_;
-};
-
-// helper function for string and lexer constructors
-TLSAImpl*
-TLSA::constructFromLexer(MasterLexer& lexer) {
-    const uint32_t certificate_usage =
-        lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (certificate_usage > 255) {
-        isc_throw(InvalidRdataText,
-                  "TLSA certificate usage field out of range");
-    }
-
-    const uint32_t selector =
-        lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (selector > 255) {
-        isc_throw(InvalidRdataText,
-                  "TLSA selector field out of range");
-    }
-
-    const uint32_t matching_type =
-        lexer.getNextToken(MasterToken::NUMBER).getNumber();
-    if (matching_type > 255) {
-        isc_throw(InvalidRdataText,
-                  "TLSA matching type field out of range");
-    }
-
-    std::string certificate_assoc_data;
-    std::string data_substr;
-    while (true) {
-        const MasterToken& token =
-            lexer.getNextToken(MasterToken::STRING, true);
-        if ((token.getType() == MasterToken::END_OF_FILE) ||
-            (token.getType() == MasterToken::END_OF_LINE)) {
-            break;
-        }
-
-        token.getString(data_substr);
-        certificate_assoc_data.append(data_substr);
-    }
-    lexer.ungetToken();
-
-    if (certificate_assoc_data.empty()) {
-        isc_throw(InvalidRdataText, "Empty TLSA certificate association data");
-    }
-
-    vector<uint8_t> data;
-    try {
-        decodeHex(certificate_assoc_data, data);
-    } catch (const isc::BadValue& e) {
-        isc_throw(InvalidRdataText,
-                  "Bad TLSA certificate association data: " << e.what());
-    }
-
-    return (new TLSAImpl(certificate_usage, selector, matching_type, data));
-}
-
-/// \brief Constructor from string.
-///
-/// The given string must represent a valid TLSA RDATA.  There can be
-/// extra space characters at the beginning or end of the text (which
-/// are simply ignored), but other extra text, including a new line,
-/// will make the construction fail with an exception.
-///
-/// The Certificate Usage, Selector and Matching Type fields must be
-/// within their valid ranges, but are not constrained to the values
-/// defined in RFC6698.
-///
-/// The Certificate Association Data Field field may be absent, but if
-/// present it must contain a valid hex encoding of the data. Whitespace
-/// is allowed in the hex text.
-///
-/// \throw InvalidRdataText if any fields are missing, out of their
-/// valid ranges, or are incorrect, or Certificate Association Data is
-/// not a valid hex string.
-///
-/// \param tlsa_str A string containing the RDATA to be created
-TLSA::TLSA(const string& tlsa_str) :
-    impl_(NULL)
-{
-    // We use a smart pointer here because if there is an exception in
-    // this constructor, the destructor is not called and there could be
-    // a leak of the TLSAImpl that constructFromLexer() returns.
-    RdataPimplHolder<TLSAImpl> impl_ptr;
-
-    try {
-        std::istringstream ss(tlsa_str);
-        MasterLexer lexer;
-        lexer.pushSource(ss);
-
-        impl_ptr.reset(constructFromLexer(lexer));
-
-        if (lexer.getNextToken().getType() != MasterToken::END_OF_FILE) {
-            isc_throw(InvalidRdataText, "extra input text for TLSA: "
-                      << tlsa_str);
-        }
-    } catch (const MasterLexer::LexerError& ex) {
-        isc_throw(InvalidRdataText, "Failed to construct TLSA from '" <<
-                  tlsa_str << "': " << ex.what());
-    }
-
-    impl_ = impl_ptr.release();
-}
-
-/// \brief Constructor with a context of MasterLexer.
-///
-/// The \c lexer should point to the beginning of valid textual representation
-/// of an TLSA RDATA.
-///
-/// \throw MasterLexer::LexerError General parsing error such as missing field.
-/// \throw InvalidRdataText Fields are out of their valid range, or are
-/// incorrect, or Certificate Association Data is not a valid hex string.
-///
-/// \param lexer A \c MasterLexer object parsing a master file for the
-/// RDATA to be created
-TLSA::TLSA(MasterLexer& lexer, const Name*,
-             MasterLoader::Options, MasterLoaderCallbacks&) :
-    impl_(constructFromLexer(lexer))
-{
-}
-
-/// \brief Constructor from InputBuffer.
-///
-/// The passed buffer must contain a valid TLSA RDATA.
-///
-/// The Certificate Usage, Selector and Matching Type fields must be
-/// within their valid ranges, but are not constrained to the values
-/// defined in RFC6698. It is okay for the certificate association data
-/// to be missing (see the description of the constructor from string).
-TLSA::TLSA(InputBuffer& buffer, size_t rdata_len) {
-    if (rdata_len < 3) {
-        isc_throw(InvalidRdataLength, "TLSA record too short");
-    }
-
-    const uint8_t certificate_usage = buffer.readUint8();
-    const uint8_t selector = buffer.readUint8();
-    const uint8_t matching_type = buffer.readUint8();
-
-    vector<uint8_t> data;
-    rdata_len -= 3;
-
-    if (rdata_len == 0) {
-        isc_throw(InvalidRdataLength,
-                  "Empty TLSA certificate association data");
-    }
-
-    data.resize(rdata_len);
-    buffer.readData(&data[0], rdata_len);
-
-    impl_ = new TLSAImpl(certificate_usage, selector, matching_type, data);
-}
-
-TLSA::TLSA(uint8_t certificate_usage, uint8_t selector,
-           uint8_t matching_type, const std::string& certificate_assoc_data) :
-    impl_(NULL)
-{
-    if (certificate_assoc_data.empty()) {
-        isc_throw(InvalidRdataText, "Empty TLSA certificate association data");
-    }
-
-    vector<uint8_t> data;
-    try {
-        decodeHex(certificate_assoc_data, data);
-    } catch (const isc::BadValue& e) {
-        isc_throw(InvalidRdataText,
-                  "Bad TLSA certificate association data: " << e.what());
-    }
-
-    impl_ = new TLSAImpl(certificate_usage, selector, matching_type, data);
-}
-
-TLSA::TLSA(const TLSA& other) :
-        Rdata(), impl_(new TLSAImpl(*other.impl_))
-{}
-
-TLSA&
-TLSA::operator=(const TLSA& source) {
-    if (this == &source) {
-        return (*this);
-    }
-
-    TLSAImpl* newimpl = new TLSAImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
-
-    return (*this);
-}
-
-TLSA::~TLSA() {
-    delete impl_;
-}
-
-void
-TLSA::toWire(OutputBuffer& buffer) const {
-    buffer.writeUint8(impl_->certificate_usage_);
-    buffer.writeUint8(impl_->selector_);
-    buffer.writeUint8(impl_->matching_type_);
-
-    // The constructors must ensure that the certificate association
-    // data field is not empty.
-    assert(!impl_->data_.empty());
-    buffer.writeData(&impl_->data_[0], impl_->data_.size());
-}
-
-void
-TLSA::toWire(AbstractMessageRenderer& renderer) const {
-    renderer.writeUint8(impl_->certificate_usage_);
-    renderer.writeUint8(impl_->selector_);
-    renderer.writeUint8(impl_->matching_type_);
-
-    // The constructors must ensure that the certificate association
-    // data field is not empty.
-    assert(!impl_->data_.empty());
-    renderer.writeData(&impl_->data_[0], impl_->data_.size());
-}
-
-string
-TLSA::toText() const {
-    // The constructors must ensure that the certificate association
-    // data field is not empty.
-    assert(!impl_->data_.empty());
-
-    return (lexical_cast<string>(static_cast<int>(impl_->certificate_usage_)) + " " +
-            lexical_cast<string>(static_cast<int>(impl_->selector_)) + " " +
-            lexical_cast<string>(static_cast<int>(impl_->matching_type_)) + " " +
-            encodeHex(impl_->data_));
-}
-
-int
-TLSA::compare(const Rdata& other) const {
-    const TLSA& other_tlsa = dynamic_cast<const TLSA&>(other);
-
-    if (impl_->certificate_usage_ < other_tlsa.impl_->certificate_usage_) {
-        return (-1);
-    } else if (impl_->certificate_usage_ >
-               other_tlsa.impl_->certificate_usage_) {
-        return (1);
-    }
-
-    if (impl_->selector_ < other_tlsa.impl_->selector_) {
-        return (-1);
-    } else if (impl_->selector_ > other_tlsa.impl_->selector_) {
-        return (1);
-    }
-
-    if (impl_->matching_type_ < other_tlsa.impl_->matching_type_) {
-        return (-1);
-    } else if (impl_->matching_type_ >
-               other_tlsa.impl_->matching_type_) {
-        return (1);
-    }
-
-    const size_t this_len = impl_->data_.size();
-    const size_t other_len = other_tlsa.impl_->data_.size();
-    const size_t cmplen = min(this_len, other_len);
-
-    if (cmplen > 0) {
-        const int cmp = memcmp(&impl_->data_[0],
-                               &other_tlsa.impl_->data_[0],
-                               cmplen);
-        if (cmp != 0) {
-            return (cmp);
-        }
-    }
-
-    if (this_len == other_len) {
-        return (0);
-    } else if (this_len < other_len) {
-        return (-1);
-    } else {
-        return (1);
-    }
-}
-
-uint8_t
-TLSA::getCertificateUsage() const {
-    return (impl_->certificate_usage_);
-}
-
-uint8_t
-TLSA::getSelector() const {
-    return (impl_->selector_);
-}
-
-uint8_t
-TLSA::getMatchingType() const {
-    return (impl_->matching_type_);
-}
-
-const std::vector<uint8_t>&
-TLSA::getData() const {
-    return (impl_->data_);
-}
-
-size_t
-TLSA::getDataLength() const {
-    return (impl_->data_.size());
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/tlsa_52.h b/src/lib/dns/rdata/generic/tlsa_52.h
deleted file mode 100644
index 007aa43ddc..0000000000
--- a/src/lib/dns/rdata/generic/tlsa_52.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <stdint.h>
-
-#include <dns/name.h>
-#include <dns/rdata.h>
-
-#include <string>
-#include <vector>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-struct TLSAImpl;
-
-class TLSA : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    TLSA(uint8_t certificate_usage, uint8_t selector,
-         uint8_t matching_type, const std::string& certificate_assoc_data);
-    TLSA& operator=(const TLSA& source);
-    ~TLSA();
-
-    ///
-    /// Specialized methods
-    ///
-    uint8_t getCertificateUsage() const;
-    uint8_t getSelector() const;
-    uint8_t getMatchingType() const;
-    const std::vector<uint8_t>& getData() const;
-    size_t getDataLength() const;
-
-private:
-    TLSAImpl* constructFromLexer(MasterLexer& lexer);
-
-    TLSAImpl* impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/src/lib/dns/rdata/generic/txt_16.cc b/src/lib/dns/rdata/generic/txt_16.cc
deleted file mode 100644
index 52d6b6473c..0000000000
--- a/src/lib/dns/rdata/generic/txt_16.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <config.h>
-
-#include <stdint.h>
-#include <string.h>
-
-#include <string>
-#include <vector>
-
-#include <util/buffer.h>
-#include <dns/exceptions.h>
-#include <dns/messagerenderer.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-#include <dns/rdata/generic/detail/txt_like.h>
-
-using namespace std;
-using namespace isc::util;
-
-// BEGIN_ISC_NAMESPACE
-// BEGIN_RDATA_NAMESPACE
-
-TXT&
-TXT::operator=(const TXT& source) {
-    if (this == &source) {
-        return (*this);
-    }
-
-    TXTImpl* newimpl = new TXTImpl(*source.impl_);
-    delete impl_;
-    impl_ = newimpl;
-
-    return (*this);
-}
-
-TXT::~TXT() {
-    delete impl_;
-}
-
-TXT::TXT(InputBuffer& buffer, size_t rdata_len) :
-    impl_(new TXTImpl(buffer, rdata_len))
-{}
-
-/// \brief Constructor using the master lexer.
-///
-/// This implementation only uses the \c lexer parameters; others are
-/// ignored.
-///
-/// \throw CharStringTooLong the parameter string length exceeds maximum.
-/// \throw InvalidRdataText the method cannot process the parameter data
-///
-/// \param lexer A \c MasterLexer object parsing a master file for this
-/// RDATA.
-TXT::TXT(MasterLexer& lexer, const Name*, MasterLoader::Options,
-         MasterLoaderCallbacks&) :
-    impl_(new TXTImpl(lexer))
-{}
-
-TXT::TXT(const std::string& txtstr) :
-    impl_(new TXTImpl(txtstr))
-{}
-
-TXT::TXT(const TXT& other) :
-    Rdata(), impl_(new TXTImpl(*other.impl_))
-{}
-
-void
-TXT::toWire(OutputBuffer& buffer) const {
-    impl_->toWire(buffer);
-}
-
-void
-TXT::toWire(AbstractMessageRenderer& renderer) const {
-    impl_->toWire(renderer);
-}
-
-string
-TXT::toText() const {
-    return (impl_->toText());
-}
-
-int
-TXT::compare(const Rdata& other) const {
-    const TXT& other_txt = dynamic_cast<const TXT&>(other);
-
-    return (impl_->compare(*other_txt.impl_));
-}
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
diff --git a/src/lib/dns/rdata/generic/txt_16.h b/src/lib/dns/rdata/generic/txt_16.h
deleted file mode 100644
index 83979c4765..0000000000
--- a/src/lib/dns/rdata/generic/txt_16.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// BEGIN_HEADER_GUARD
-
-#include <stdint.h>
-
-#include <string>
-#include <vector>
-
-#include <dns/rdata.h>
-
-// BEGIN_ISC_NAMESPACE
-
-// BEGIN_COMMON_DECLARATIONS
-// END_COMMON_DECLARATIONS
-
-// BEGIN_RDATA_NAMESPACE
-
-namespace detail {
-template<class Type, uint16_t typeCode> class TXTLikeImpl;
-}
-
-class TXT : public Rdata {
-public:
-    // BEGIN_COMMON_MEMBERS
-    // END_COMMON_MEMBERS
-
-    TXT& operator=(const TXT& source);
-    ~TXT();
-
-private:
-    typedef isc::dns::rdata::generic::detail::TXTLikeImpl<TXT, 16> TXTImpl;
-    TXTImpl* impl_;
-};
-
-// END_RDATA_NAMESPACE
-// END_ISC_NAMESPACE
-// END_HEADER_GUARD
-
-// Local Variables: 
-// mode: c++
-// End: