cleanup: use relative path to header files from "src/lib", i.e., s/"name.h"/<dns/name.h", etc. also removed unnecessary header files to be included.

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1705 e5f2f494-b856-4b98-b285-d166d9295462

64 files changed, 277 insertions, 283 deletions

diff --git a/src/lib/dns/base32.cc b/src/lib/dns/base32.cc
index 5724239043..c7057feba7 100644
--- a/src/lib/dns/base32.cc
+++ b/src/lib/dns/base32.cc
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "base32.h"
+#include <dns/base32.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/base64.cc b/src/lib/dns/base64.cc
index 41ed97c6bf..f1082452b8 100644
--- a/src/lib/dns/base64.cc
+++ b/src/lib/dns/base64.cc
@@ -14,8 +14,6 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <stdint.h>
 #include <cassert>
 #include <iterator>
@@ -26,9 +24,10 @@
 #include <boost/archive/iterators/binary_from_base64.hpp>
 #include <boost/archive/iterators/transform_width.hpp>
 
-#include "base64.h"
 #include <exceptions/exceptions.h>
 
+#include <dns/base64.h>
+
 using namespace std;
 using namespace boost::archive::iterators;
 
diff --git a/src/lib/dns/dnssectime.cc b/src/lib/dns/dnssectime.cc
index 061a6bc455..71e42cf80f 100644
--- a/src/lib/dns/dnssectime.cc
+++ b/src/lib/dns/dnssectime.cc
@@ -25,15 +25,15 @@
 
 #include <exceptions/exceptions.h>
 
-#include "base64.h"
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
-#include "rdataclass.h"
-#include "dnssectime.h"
+#include <dns/base64.h>
+#include <dns/buffer.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/dnssectime.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/exceptions.cc b/src/lib/dns/exceptions.cc
index 0f68b6d14f..731a92de87 100644
--- a/src/lib/dns/exceptions.cc
+++ b/src/lib/dns/exceptions.cc
@@ -14,8 +14,8 @@
 
 // $Id$
 
-#include "exceptions.h"
-#include "message.h"
+#include <dns/exceptions.h>
+#include <dns/message.h>
 
 namespace isc {
 namespace dns {
diff --git a/src/lib/dns/hex.cc b/src/lib/dns/hex.cc
index 1570c4fe92..a664c31435 100644
--- a/src/lib/dns/hex.cc
+++ b/src/lib/dns/hex.cc
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <stdint.h>
 
-#include "hex.h"
+#include <dns/hex.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/message.cc b/src/lib/dns/message.cc
index f6fafbb375..0de7905778 100644
--- a/src/lib/dns/message.cc
+++ b/src/lib/dns/message.cc
@@ -26,17 +26,17 @@
 
 #include <exceptions/exceptions.h>
 
-#include "buffer.h"
-#include "exceptions.h"
-#include "message.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "question.h"
-#include "rdataclass.h"
-#include "rrclass.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rrset.h"
+#include <dns/buffer.h>
+#include <dns/exceptions.h>
+#include <dns/message.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/question.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rrset.h>
 
 using namespace std;
 using namespace boost;
diff --git a/src/lib/dns/message.h b/src/lib/dns/message.h
index 3353031b05..86b5edf38c 100644
--- a/src/lib/dns/message.h
+++ b/src/lib/dns/message.h
@@ -25,8 +25,8 @@
 
 #include <exceptions/exceptions.h>
 
-#include "question.h"
-#include "rrset.h"
+#include <dns/question.h>
+#include <dns/rrset.h>
 
 namespace isc {
 namespace dns {
diff --git a/src/lib/dns/messagerenderer.cc b/src/lib/dns/messagerenderer.cc
index a5bff63afe..1ff4c25ef8 100644
--- a/src/lib/dns/messagerenderer.cc
+++ b/src/lib/dns/messagerenderer.cc
@@ -18,9 +18,9 @@
 #include <cassert>
 #include <set>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
 
 namespace isc {
 namespace dns {
diff --git a/src/lib/dns/name.cc b/src/lib/dns/name.cc
index 111c08127c..29c4cdbaec 100644
--- a/src/lib/dns/name.cc
+++ b/src/lib/dns/name.cc
@@ -20,13 +20,12 @@
 #include <functional>
 #include <vector>
 #include <iostream>
-
 #include <algorithm>
 
-#include "buffer.h"
-#include "exceptions.h"
-#include "name.h"
-#include "messagerenderer.h"
+#include <dns/buffer.h>
+#include <dns/exceptions.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
 
 using namespace std;
 using isc::dns::NameComparisonResult;
diff --git a/src/lib/dns/python_dns.cc b/src/lib/dns/python_dns.cc
index 65787b4768..ebf61898cc 100644
--- a/src/lib/dns/python_dns.cc
+++ b/src/lib/dns/python_dns.cc
@@ -27,18 +27,18 @@
 
 #include <exceptions/exceptions.h>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rrtype.h"
-#include "rrclass.h"
-#include "rrttl.h"
-#include "rrset.h"
-#include "rdata.h"
-#include "rdataclass.h"
-#include "rrsetlist.h"
-#include "question.h"
-#include "message.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrtype.h>
+#include <dns/rrclass.h>
+#include <dns/rrttl.h>
+#include <dns/rrset.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrsetlist.h>
+#include <dns/question.h>
+#include <dns/message.h>
 
 using namespace isc::dns;
 using namespace boost::python;
diff --git a/src/lib/dns/question.cc b/src/lib/dns/question.cc
index 02c8802a01..41ace32f5d 100644
--- a/src/lib/dns/question.cc
+++ b/src/lib/dns/question.cc
@@ -17,12 +17,12 @@
 #include <iostream>
 #include <string>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "question.h"
-#include "rrclass.h"
-#include "rrtype.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/question.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/question.h b/src/lib/dns/question.h
index 20b5497e6b..e684871bc6 100644
--- a/src/lib/dns/question.h
+++ b/src/lib/dns/question.h
@@ -22,9 +22,9 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "name.h"
-#include "rrclass.h"
-#include "rrtype.h"
+#include <dns/name.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
 
 namespace isc {
 namespace dns {
diff --git a/src/lib/dns/rdata.cc b/src/lib/dns/rdata.cc
index 1dbfc4bf7e..348ffd4b6b 100644
--- a/src/lib/dns/rdata.cc
+++ b/src/lib/dns/rdata.cc
@@ -29,12 +29,12 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rrparamregistry.h"
-#include "rrtype.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rrparamregistry.h>
+#include <dns/rrtype.h>
 
 using namespace std;
 using namespace boost;
diff --git a/src/lib/dns/rdata/ch_3/a_1.cc b/src/lib/dns/rdata/ch_3/a_1.cc
index 639a11250b..3044ae36ae 100644
--- a/src/lib/dns/rdata/ch_3/a_1.cc
+++ b/src/lib/dns/rdata/ch_3/a_1.cc
@@ -18,11 +18,12 @@
 
 #include <string>
 
-#include "buffer.h"
 #include <exceptions/exceptions.h>
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/rdata/ch_3/a_1.h b/src/lib/dns/rdata/ch_3/a_1.h
index dcd2f7dafc..9e827bbbb0 100644
--- a/src/lib/dns/rdata/ch_3/a_1.h
+++ b/src/lib/dns/rdata/ch_3/a_1.h
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/generic/cname_5.cc b/src/lib/dns/rdata/generic/cname_5.cc
index 3ea0b69188..26d688c6e2 100644
--- a/src/lib/dns/rdata/generic/cname_5.cc
+++ b/src/lib/dns/rdata/generic/cname_5.cc
@@ -14,15 +14,15 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/rdata/generic/cname_5.h b/src/lib/dns/rdata/generic/cname_5.h
index abfea1fe83..9630cea691 100644
--- a/src/lib/dns/rdata/generic/cname_5.h
+++ b/src/lib/dns/rdata/generic/cname_5.h
@@ -18,8 +18,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/generic/dname_39.cc b/src/lib/dns/rdata/generic/dname_39.cc
index 4ab0c4417d..b85e8168ed 100644
--- a/src/lib/dns/rdata/generic/dname_39.cc
+++ b/src/lib/dns/rdata/generic/dname_39.cc
@@ -18,11 +18,11 @@
 
 #include <string>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/rdata/generic/dname_39.h b/src/lib/dns/rdata/generic/dname_39.h
index 13d13504fe..7a12abd52f 100644
--- a/src/lib/dns/rdata/generic/dname_39.h
+++ b/src/lib/dns/rdata/generic/dname_39.h
@@ -18,8 +18,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/generic/dnskey_48.cc b/src/lib/dns/rdata/generic/dnskey_48.cc
index 169673ddc2..7bc3ab910a 100644
--- a/src/lib/dns/rdata/generic/dnskey_48.cc
+++ b/src/lib/dns/rdata/generic/dnskey_48.cc
@@ -14,22 +14,21 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <vector>
 
-#include "base64.h"
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rdata.h"
-#include "rdataclass.h"
 #include <boost/lexical_cast.hpp>
 #include <boost/foreach.hpp>
 
+#include <dns/base64.h>
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+
 #include <stdio.h>
 #include <time.h>
 
diff --git a/src/lib/dns/rdata/generic/dnskey_48.h b/src/lib/dns/rdata/generic/dnskey_48.h
index 7e1e8e3ca2..e6762270c8 100644
--- a/src/lib/dns/rdata/generic/dnskey_48.h
+++ b/src/lib/dns/rdata/generic/dnskey_48.h
@@ -18,10 +18,10 @@
 
 #include <string>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 
diff --git a/src/lib/dns/rdata/generic/ds_43.cc b/src/lib/dns/rdata/generic/ds_43.cc
index ac551c8c65..8fd900af42 100644
--- a/src/lib/dns/rdata/generic/ds_43.cc
+++ b/src/lib/dns/rdata/generic/ds_43.cc
@@ -14,21 +14,20 @@
 
 // $Id$
 
-#include <config.h>
-
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <vector>
 
-#include "buffer.h"
-#include "hex.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rdata.h"
-#include "rdataclass.h"
 #include <boost/lexical_cast.hpp>
 
+#include <dns/buffer.h>
+#include <dns/hex.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+
 #include <stdio.h>
 #include <time.h>
 
diff --git a/src/lib/dns/rdata/generic/ds_43.h b/src/lib/dns/rdata/generic/ds_43.h
index 080f081d29..e88c33966f 100644
--- a/src/lib/dns/rdata/generic/ds_43.h
+++ b/src/lib/dns/rdata/generic/ds_43.h
@@ -18,10 +18,10 @@
 
 #include <string>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 
diff --git a/src/lib/dns/rdata/generic/mx_15.cc b/src/lib/dns/rdata/generic/mx_15.cc
index 14fe205983..3f19dd5f5d 100644
--- a/src/lib/dns/rdata/generic/mx_15.cc
+++ b/src/lib/dns/rdata/generic/mx_15.cc
@@ -14,18 +14,19 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
 #include <boost/lexical_cast.hpp>
 
-#include "buffer.h"
 #include <exceptions/exceptions.h>
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 using namespace boost;
diff --git a/src/lib/dns/rdata/generic/mx_15.h b/src/lib/dns/rdata/generic/mx_15.h
index 182371ec69..c822709d42 100644
--- a/src/lib/dns/rdata/generic/mx_15.h
+++ b/src/lib/dns/rdata/generic/mx_15.h
@@ -20,8 +20,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/generic/ns_2.cc b/src/lib/dns/rdata/generic/ns_2.cc
index c649c02cd9..5dcc44244d 100644
--- a/src/lib/dns/rdata/generic/ns_2.cc
+++ b/src/lib/dns/rdata/generic/ns_2.cc
@@ -14,15 +14,15 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/rdata/generic/ns_2.h b/src/lib/dns/rdata/generic/ns_2.h
index 9fe8960f1e..4e7d0b7183 100644
--- a/src/lib/dns/rdata/generic/ns_2.h
+++ b/src/lib/dns/rdata/generic/ns_2.h
@@ -18,8 +18,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/generic/nsec3_50.cc b/src/lib/dns/rdata/generic/nsec3_50.cc
index 13b5e4eede..3b782d3247 100644
--- a/src/lib/dns/rdata/generic/nsec3_50.cc
+++ b/src/lib/dns/rdata/generic/nsec3_50.cc
@@ -14,26 +14,25 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <iostream>
 #include <iomanip>
 #include <string>
 #include <sstream>
 #include <vector>
 
-#include "base32.h"
-#include "buffer.h"
-#include "exceptions.h"
-#include "hex.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
-#include "rdataclass.h"
 #include <boost/lexical_cast.hpp>
 
+#include <dns/base32.h>
+#include <dns/buffer.h>
+#include <dns/exceptions.h>
+#include <dns/hex.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 <stdio.h>
 #include <time.h>
 
diff --git a/src/lib/dns/rdata/generic/nsec3_50.h b/src/lib/dns/rdata/generic/nsec3_50.h
index 8884b5527c..eeec8bb138 100644
--- a/src/lib/dns/rdata/generic/nsec3_50.h
+++ b/src/lib/dns/rdata/generic/nsec3_50.h
@@ -19,10 +19,10 @@
 #include <string>
 #include <vector>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 
diff --git a/src/lib/dns/rdata/generic/nsec3param_51.cc b/src/lib/dns/rdata/generic/nsec3param_51.cc
index 2cd26ecc1c..4debf3321e 100644
--- a/src/lib/dns/rdata/generic/nsec3param_51.cc
+++ b/src/lib/dns/rdata/generic/nsec3param_51.cc
@@ -14,21 +14,20 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <vector>
 
-#include "buffer.h"
-#include "hex.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rdata.h"
-#include "rdataclass.h"
 #include <boost/lexical_cast.hpp>
 
+#include <dns/buffer.h>
+#include <dns/hex.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+
 #include <stdio.h>
 #include <time.h>
 
diff --git a/src/lib/dns/rdata/generic/nsec3param_51.h b/src/lib/dns/rdata/generic/nsec3param_51.h
index 022b8a4b18..cad236fcf9 100644
--- a/src/lib/dns/rdata/generic/nsec3param_51.h
+++ b/src/lib/dns/rdata/generic/nsec3param_51.h
@@ -19,10 +19,10 @@
 #include <string>
 #include <vector>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 
diff --git a/src/lib/dns/rdata/generic/nsec_47.cc b/src/lib/dns/rdata/generic/nsec_47.cc
index 422549c796..2e52ae64bb 100644
--- a/src/lib/dns/rdata/generic/nsec_47.cc
+++ b/src/lib/dns/rdata/generic/nsec_47.cc
@@ -14,22 +14,20 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <vector>
 
-#include "base64.h"
-#include "buffer.h"
-#include "exceptions.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/base64.h>
+#include <dns/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 <stdio.h>
 #include <time.h>
diff --git a/src/lib/dns/rdata/generic/nsec_47.h b/src/lib/dns/rdata/generic/nsec_47.h
index 968f7bea78..0140bca035 100644
--- a/src/lib/dns/rdata/generic/nsec_47.h
+++ b/src/lib/dns/rdata/generic/nsec_47.h
@@ -18,10 +18,10 @@
 
 #include <string>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 
diff --git a/src/lib/dns/rdata/generic/opt_41.cc b/src/lib/dns/rdata/generic/opt_41.cc
index e6fe438750..70beb23b70 100644
--- a/src/lib/dns/rdata/generic/opt_41.cc
+++ b/src/lib/dns/rdata/generic/opt_41.cc
@@ -14,14 +14,14 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/rdata/generic/opt_41.h b/src/lib/dns/rdata/generic/opt_41.h
index 832c664b87..d62d870c18 100644
--- a/src/lib/dns/rdata/generic/opt_41.h
+++ b/src/lib/dns/rdata/generic/opt_41.h
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/generic/ptr_12.cc b/src/lib/dns/rdata/generic/ptr_12.cc
index d4ee245f90..1606f688aa 100644
--- a/src/lib/dns/rdata/generic/ptr_12.cc
+++ b/src/lib/dns/rdata/generic/ptr_12.cc
@@ -14,15 +14,15 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/rdata/generic/ptr_12.h b/src/lib/dns/rdata/generic/ptr_12.h
index 608af43026..8fc42dbd4b 100644
--- a/src/lib/dns/rdata/generic/ptr_12.h
+++ b/src/lib/dns/rdata/generic/ptr_12.h
@@ -18,8 +18,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/generic/rrsig_46.cc b/src/lib/dns/rdata/generic/rrsig_46.cc
index 12391a97db..bfcd728432 100644
--- a/src/lib/dns/rdata/generic/rrsig_46.cc
+++ b/src/lib/dns/rdata/generic/rrsig_46.cc
@@ -14,25 +14,24 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <string>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 #include <vector>
 
-#include "base64.h"
-#include "buffer.h"
-#include "dnssectime.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
-#include "rdataclass.h"
 #include <boost/lexical_cast.hpp>
 
+#include <dns/base64.h>
+#include <dns/buffer.h>
+#include <dns/dnssectime.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 <stdio.h>
 #include <time.h>
 
diff --git a/src/lib/dns/rdata/generic/rrsig_46.h b/src/lib/dns/rdata/generic/rrsig_46.h
index 0a0213ba0f..3cc254a3e0 100644
--- a/src/lib/dns/rdata/generic/rrsig_46.h
+++ b/src/lib/dns/rdata/generic/rrsig_46.h
@@ -18,10 +18,10 @@
 
 #include <string>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 
diff --git a/src/lib/dns/rdata/generic/soa_6.cc b/src/lib/dns/rdata/generic/soa_6.cc
index 2739337964..a95b9067ed 100644
--- a/src/lib/dns/rdata/generic/soa_6.cc
+++ b/src/lib/dns/rdata/generic/soa_6.cc
@@ -14,18 +14,19 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
 #include <boost/lexical_cast.hpp>
 
-#include "buffer.h"
 #include <exceptions/exceptions.h>
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 using namespace boost;
diff --git a/src/lib/dns/rdata/generic/soa_6.h b/src/lib/dns/rdata/generic/soa_6.h
index 1b278a5702..573a47f3d4 100644
--- a/src/lib/dns/rdata/generic/soa_6.h
+++ b/src/lib/dns/rdata/generic/soa_6.h
@@ -18,8 +18,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/generic/txt_16.cc b/src/lib/dns/rdata/generic/txt_16.cc
index a5d3d0214f..ccd84dfa53 100644
--- a/src/lib/dns/rdata/generic/txt_16.cc
+++ b/src/lib/dns/rdata/generic/txt_16.cc
@@ -14,18 +14,16 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <stdint.h>
 #include <string.h>
 
 #include <string>
 #include <vector>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/rdata/generic/txt_16.h b/src/lib/dns/rdata/generic/txt_16.h
index 28ba00cea0..33a1ee2a58 100644
--- a/src/lib/dns/rdata/generic/txt_16.h
+++ b/src/lib/dns/rdata/generic/txt_16.h
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/hs_4/a_1.cc b/src/lib/dns/rdata/hs_4/a_1.cc
index 2294ed6242..bf009e9880 100644
--- a/src/lib/dns/rdata/hs_4/a_1.cc
+++ b/src/lib/dns/rdata/hs_4/a_1.cc
@@ -14,15 +14,16 @@
 
 // $Id$
 
-#include <config.h>             // for UNUSED
+#include <config.h>             // for UNUSED_PARAM
 
 #include <string>
 
-#include "buffer.h"
 #include <exceptions/exceptions.h>
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/rdata/hs_4/a_1.h b/src/lib/dns/rdata/hs_4/a_1.h
index dcd2f7dafc..9e827bbbb0 100644
--- a/src/lib/dns/rdata/hs_4/a_1.h
+++ b/src/lib/dns/rdata/hs_4/a_1.h
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/in_1/a_1.cc b/src/lib/dns/rdata/in_1/a_1.cc
index f521132dcb..f9d3599b9f 100644
--- a/src/lib/dns/rdata/in_1/a_1.cc
+++ b/src/lib/dns/rdata/in_1/a_1.cc
@@ -14,8 +14,6 @@
 
 // $Id: rdata.cc 545 2010-01-27 00:33:28Z jinmei $
 
-#include "config.h"
-
 #include <stdint.h>
 #include <string.h>
 
@@ -26,11 +24,11 @@
 
 #include <exceptions/exceptions.h>
 
-#include "buffer.h"
-#include "exceptions.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/exceptions.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/rdata/in_1/a_1.h b/src/lib/dns/rdata/in_1/a_1.h
index a179251e8d..d684267829 100644
--- a/src/lib/dns/rdata/in_1/a_1.h
+++ b/src/lib/dns/rdata/in_1/a_1.h
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/in_1/aaaa_28.cc b/src/lib/dns/rdata/in_1/aaaa_28.cc
index 9be43c93d9..f9bf54b68c 100644
--- a/src/lib/dns/rdata/in_1/aaaa_28.cc
+++ b/src/lib/dns/rdata/in_1/aaaa_28.cc
@@ -14,8 +14,6 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <stdint.h>
 #include <string.h>
 
@@ -26,11 +24,11 @@
 
 #include <exceptions/exceptions.h>
 
-#include "buffer.h"
-#include "exceptions.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/exceptions.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/rdata/in_1/aaaa_28.h b/src/lib/dns/rdata/in_1/aaaa_28.h
index c9d1b4df88..cf4f4509e6 100644
--- a/src/lib/dns/rdata/in_1/aaaa_28.h
+++ b/src/lib/dns/rdata/in_1/aaaa_28.h
@@ -20,7 +20,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rdata/template.cc b/src/lib/dns/rdata/template.cc
index b2c791bcf0..f6b79343c9 100644
--- a/src/lib/dns/rdata/template.cc
+++ b/src/lib/dns/rdata/template.cc
@@ -16,10 +16,10 @@
 
 #include <string>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 
diff --git a/src/lib/dns/rdata/template.h b/src/lib/dns/rdata/template.h
index 674f5f5645..9541af232e 100644
--- a/src/lib/dns/rdata/template.h
+++ b/src/lib/dns/rdata/template.h
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 
diff --git a/src/lib/dns/rrclass.cc b/src/lib/dns/rrclass.cc
index ab0fa9dd4e..37b979120b 100644
--- a/src/lib/dns/rrclass.cc
+++ b/src/lib/dns/rrclass.cc
@@ -14,15 +14,16 @@
 
 // $Id$
 
-#include <string>
-
 #include <stdint.h>
 
-#include "buffer.h"
+#include <string>
+
 #include <exceptions/exceptions.h>
-#include "messagerenderer.h"
-#include "rrparamregistry.h"
-#include "rrclass.h"
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrparamregistry.h>
+#include <dns/rrclass.h>
 
 using namespace std;
 using namespace isc::dns;
diff --git a/src/lib/dns/rrparamregistry-placeholder.cc b/src/lib/dns/rrparamregistry-placeholder.cc
index 178f23fe6f..a76082cdd1 100644
--- a/src/lib/dns/rrparamregistry-placeholder.cc
+++ b/src/lib/dns/rrparamregistry-placeholder.cc
@@ -28,11 +28,12 @@
 #include <boost/shared_ptr.hpp>
 
 #include <exceptions/exceptions.h>
-#include "rrparamregistry.h"
-#include "rrclass.h"
-#include "rrtype.h"
-#include "rdata.h"
-#include "rdataclass.h"
+
+#include <dns/rrparamregistry.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 using namespace boost;
diff --git a/src/lib/dns/rrparamregistry.h b/src/lib/dns/rrparamregistry.h
index 3e33abcff4..408738ab65 100644
--- a/src/lib/dns/rrparamregistry.h
+++ b/src/lib/dns/rrparamregistry.h
@@ -24,7 +24,8 @@
 #include <boost/shared_ptr.hpp>
 
 #include <exceptions/exceptions.h>
-#include "rdata.h"
+
+#include <dns/rdata.h>
 
 namespace isc {
 namespace dns {
diff --git a/src/lib/dns/rrset.cc b/src/lib/dns/rrset.cc
index 593325bc40..11e33190fe 100644
--- a/src/lib/dns/rrset.cc
+++ b/src/lib/dns/rrset.cc
@@ -20,13 +20,13 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rrclass.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rrset.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rrset.h>
 
 using namespace std;
 using namespace isc::dns;
diff --git a/src/lib/dns/rrset.h b/src/lib/dns/rrset.h
index 847372f1cf..9a1ce05694 100644
--- a/src/lib/dns/rrset.h
+++ b/src/lib/dns/rrset.h
@@ -24,8 +24,8 @@
 
 #include <exceptions/exceptions.h>
 
-#include "rdata.h"
-#include "rrtype.h"
+#include <dns/rdata.h>
+#include <dns/rrtype.h>
 
 namespace isc {
 namespace dns {
diff --git a/src/lib/dns/rrsetlist.cc b/src/lib/dns/rrsetlist.cc
index d0460bdc0e..976f420220 100644
--- a/src/lib/dns/rrsetlist.cc
+++ b/src/lib/dns/rrsetlist.cc
@@ -20,10 +20,10 @@
 
 #include <exceptions/exceptions.h>
 
-#include "rrclass.h"
-#include "rrtype.h"
-#include "rrset.h"
-#include "rrsetlist.h"
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrset.h>
+#include <dns/rrsetlist.h>
 
 namespace isc {
 namespace dns {
diff --git a/src/lib/dns/rrsetlist.h b/src/lib/dns/rrsetlist.h
index 85cbee3dc0..9e1c52334f 100644
--- a/src/lib/dns/rrsetlist.h
+++ b/src/lib/dns/rrsetlist.h
@@ -23,9 +23,9 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "rrset.h"
-#include "rrclass.h"
-#include "rrtype.h"
+#include <dns/rrset.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
 
 namespace isc {
 namespace dns {
diff --git a/src/lib/dns/rrttl.cc b/src/lib/dns/rrttl.cc
index 6902563df9..ce4350ce6a 100644
--- a/src/lib/dns/rrttl.cc
+++ b/src/lib/dns/rrttl.cc
@@ -14,15 +14,15 @@
 
 // $Id$
 
-#include <sstream>
-
 #include <stdint.h>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rrttl.h"
+#include <sstream>
+#include <ostream>
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrttl.h>
 
-#include <iostream>
 using namespace std;
 using namespace isc::dns;
 
diff --git a/src/lib/dns/rrtype.cc b/src/lib/dns/rrtype.cc
index b93c3568be..09af15bde4 100644
--- a/src/lib/dns/rrtype.cc
+++ b/src/lib/dns/rrtype.cc
@@ -14,15 +14,17 @@
 
 // $Id$
 
-#include <string>
-
 #include <stdint.h>
 
-#include "buffer.h"
+#include <string>
+#include <ostream>
+
 #include <exceptions/exceptions.h>
-#include "messagerenderer.h"
-#include "rrparamregistry.h"
-#include "rrtype.h"
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrparamregistry.h>
+#include <dns/rrtype.h>
 
 using namespace std;
 using isc::dns::RRType;
diff --git a/src/lib/dns/sha1.cc b/src/lib/dns/sha1.cc
index aa3425979b..711bcdc56a 100644
--- a/src/lib/dns/sha1.cc
+++ b/src/lib/dns/sha1.cc
@@ -50,7 +50,7 @@
  *      without express or implied warranty of any kind.
  *      
  */
-#include "sha1.h"
+#include <dns/sha1.h>
 
 /* Local Function Prototyptes */
 static void SHA1Finalize(SHA1Context *, uint8_t Pad_Byte);
diff --git a/src/lib/dns/tests/unittest_util.cc b/src/lib/dns/tests/unittest_util.cc
index 9d5636992b..f5b7a62526 100644
--- a/src/lib/dns/tests/unittest_util.cc
+++ b/src/lib/dns/tests/unittest_util.cc
@@ -14,7 +14,7 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/src/lib/dns/tsig.cc b/src/lib/dns/tsig.cc
index 6443e18168..a5f237063c 100644
--- a/src/lib/dns/tsig.cc
+++ b/src/lib/dns/tsig.cc
@@ -21,7 +21,7 @@
 
 #include <algorithm>
 
-#include "tsig.h"
+#include <dns/tsig.h>
 
 using namespace std;
 using isc::dns::MessageRenderer;
diff --git a/src/lib/dns/tsig.h b/src/lib/dns/tsig.h
index 17823a0d5d..7b09fd8cd6 100644
--- a/src/lib/dns/tsig.h
+++ b/src/lib/dns/tsig.h
@@ -22,8 +22,8 @@
 
 #include <exceptions/exceptions.h>
 
-#include "name.h"
-#include "message.h"
+#include <dns/name.h>
+#include <dns/message.h>
 
 namespace isc {
 namespace dns {