diff --git a/include/icmpv6.h b/include/icmpv6.h
index 8543816..bc48c04 100644
--- a/include/icmpv6.h
+++ b/include/icmpv6.h
@@ -317,6 +317,8 @@ public:
         {
             std::fill(key_hash, key_hash + sizeof(key_hash), 0);
         }
+
+        static rsa_sign_type from_option(const option &opt);
     };
     
     /**
@@ -330,6 +332,8 @@ public:
           const ipaddress_type &address = ipaddress_type())
         : option_code(option_code), prefix_len(prefix_len), address(address)
         {}
+
+        static ip_prefix_type from_option(const option &opt);
     };
     
     /**
@@ -346,6 +350,8 @@ public:
           const ipaddress_type &address = ipaddress_type())
         : dist(dist), pref(pref), r(r), valid_lifetime(valid_lifetime),
           address(address) { }
+
+        static map_type from_option(const option &opt);
     };
     
     /**
@@ -363,6 +369,8 @@ public:
           uint32_t route_lifetime = 0, const prefix_type &prefix = prefix_type())
         : prefix_len(prefix_len), pref(pref), route_lifetime(route_lifetime),
           prefix(prefix) { }
+
+        static route_info_type from_option(const option &opt);
     };
     
     /**
@@ -377,6 +385,8 @@ public:
         recursive_dns_type(uint32_t lifetime = 0, 
           const servers_type &servers = servers_type())
         : lifetime(lifetime), servers(servers) {}
+
+        static recursive_dns_type from_option(const option &opt);
     };
     
     /**
@@ -391,6 +401,8 @@ public:
         handover_key_req_type(small_uint<4> AT = 0,
           const key_type &key = key_type())
         : AT(AT), key(key) { }
+
+        static handover_key_req_type from_option(const option &opt);
     };
     
     /**
@@ -402,6 +414,8 @@ public:
         handover_key_reply_type(uint16_t lifetime = 0, small_uint<4> AT = 0,
           const key_type &key = key_type())
         : handover_key_req_type(AT, key), lifetime(lifetime) { }
+
+        static handover_key_reply_type from_option(const option &opt);
     };
     
     /**
@@ -416,6 +430,8 @@ public:
         handover_assist_info_type(uint8_t option_code=0, 
           const hai_type &hai = hai_type())
         : option_code(option_code), hai(hai) { }
+
+        static handover_assist_info_type from_option(const option &opt);
     };
     
     /**
@@ -430,6 +446,8 @@ public:
         mobile_node_id_type(uint8_t option_code=0, 
           const mn_type &mn = mn_type())
         : option_code(option_code), mn(mn) { }
+
+        static mobile_node_id_type from_option(const option &opt);
     };
     
     /**
@@ -444,6 +462,24 @@ public:
         dns_search_list_type(uint32_t lifetime = 0,
           const domains_type &domains = domains_type())
         : lifetime(lifetime), domains(domains) { }
+
+        static dns_search_list_type from_option(const option &opt);
+    };
+
+    /**
+     * The type used to store the timestamp option.
+     */
+    struct timestamp_type {
+        uint8_t reserved[6];
+        uint64_t timestamp;
+
+        timestamp_type(uint64_t timestamp = 0)
+        : timestamp(timestamp)
+        {
+            std::fill(reserved, reserved + sizeof(reserved), 0);
+        }
+
+        static timestamp_type from_option(const option &opt);
     };
     
     /**
@@ -908,7 +944,7 @@ public:
      * 
      * \param value The new timestamp option data.
      */
-    void timestamp(uint64_t value);
+    void timestamp(const timestamp_type &value);
     
     /**
      * \brief Setter for the new nonce option.
@@ -1092,7 +1128,7 @@ public:
      * This method will throw an option_not_found exception if the
      * option is not found.
      */
-    uint64_t timestamp() const;
+    timestamp_type timestamp() const;
     
     /**
      * \brief Getter for the nonce option.
@@ -1252,6 +1288,14 @@ private:
         return option;
     }
 
+    template<typename T>
+    T search_and_convert(OptionTypes type) const {
+        const option *opt = search_option(type);
+        if(!opt)
+            throw option_not_found();
+        return opt->to<T>();
+    }
+
     icmp6hdr _header;
     ipaddress_type _target_address, _dest_address;
     options_type _options;
diff --git a/include/pdu_option.h b/include/pdu_option.h
index 2f663c9..628d8ae 100644
--- a/include/pdu_option.h
+++ b/include/pdu_option.h
@@ -38,6 +38,7 @@
 #include "endianness.h"
 #include "internals.h"
 #include "ip_address.h"
+#include "hw_address.h"
 #include "ipv6_address.h"
 
 namespace Tins {
@@ -101,6 +102,16 @@ namespace Internals {
             return convert_to_integral<uint64_t>(opt);
         }
     };
+
+    template<size_t n>
+    struct converter<HWAddress<n> > {
+        template<typename X, typename PDUType>
+        static HWAddress<n> convert(const PDUOption<X, PDUType>& opt) {
+            if(opt.data_size() != n)
+                throw malformed_option();
+            return HWAddress<n>(opt.data_ptr());
+        }
+    };
     
     template<typename T>
     struct converter<std::vector<T>, typename enable_if<is_unsigned_integral<T>::value>::type> {
diff --git a/src/icmpv6.cpp b/src/icmpv6.cpp
index 3d1afa4..10cab09 100644
--- a/src/icmpv6.cpp
+++ b/src/icmpv6.cpp
@@ -367,10 +367,10 @@ void ICMPv6::rsa_signature(const rsa_sign_type &value) {
     add_option(option(RSA_SIGN, buffer.begin(), buffer.end()));
 }
 
-void ICMPv6::timestamp(uint64_t value) {
+void ICMPv6::timestamp(const timestamp_type &value) {
     std::vector<uint8_t> buffer(6 + sizeof(uint64_t));
-    buffer.insert(buffer.begin(), 6, 0);
-    *((uint64_t*)&buffer[6]) = Endian::host_to_be(value);
+    std::copy(value.reserved, value.reserved + 6, buffer.begin());
+    *((uint64_t*)&buffer[6]) = Endian::host_to_be(value.timestamp);
     add_option(option(TIMESTAMP, buffer.begin(), buffer.end()));
 }
 
@@ -543,24 +543,15 @@ void ICMPv6::dns_search_list(const dns_search_list_type &value) {
 // ********************************************************************
 
 ICMPv6::hwaddress_type ICMPv6::source_link_layer_addr() const {
-    const option *opt = search_option(SOURCE_ADDRESS);
-    if(!opt || opt->data_size() != hwaddress_type::address_size)
-        throw option_not_found();
-    return hwaddress_type(opt->data_ptr());
+    return search_and_convert<hwaddress_type>(SOURCE_ADDRESS);
 }
 
 ICMPv6::hwaddress_type ICMPv6::target_link_layer_addr() const {
-    const option *opt = search_option(TARGET_ADDRESS);
-    if(!opt || opt->data_size() != hwaddress_type::address_size)
-        throw option_not_found();
-    return hwaddress_type(opt->data_ptr());
+    return search_and_convert<hwaddress_type>(TARGET_ADDRESS);
 }
 
 ICMPv6::prefix_info_type ICMPv6::prefix_info() const {
-    const option *opt = search_option(PREFIX_INFO);
-    if(!opt)
-        throw option_not_found();
-    return opt->to<prefix_info_type>();
+    return search_and_convert<prefix_info_type>(PREFIX_INFO);
 }
 
 PDU::serialization_type ICMPv6::redirect_header() const {
@@ -572,10 +563,7 @@ PDU::serialization_type ICMPv6::redirect_header() const {
 }
 
 ICMPv6::mtu_type ICMPv6::mtu() const {
-    const option *opt = search_option(MTU);
-    if(!opt)
-        throw option_not_found();
-    return opt->to<mtu_type>();
+    return search_and_convert<mtu_type>(MTU);
 }
 
 uint8_t ICMPv6::shortcut_limit() const {
@@ -593,10 +581,7 @@ uint32_t ICMPv6::new_advert_interval() const {
 }
 
 ICMPv6::new_ha_info_type ICMPv6::new_home_agent_info() const {
-    const option *opt = search_option(HOME_AGENT_INFO);
-    if(!opt)
-        throw option_not_found();
-    return opt->to<new_ha_info_type>();
+    return search_and_convert<new_ha_info_type>(HOME_AGENT_INFO);
 }
 
 ICMPv6::addr_list_type ICMPv6::source_addr_list() const {
@@ -608,194 +593,63 @@ ICMPv6::addr_list_type ICMPv6::target_addr_list() const {
 }
 
 ICMPv6::addr_list_type ICMPv6::search_addr_list(OptionTypes type) const {
-    const option *opt = search_option(type);
-    if(!opt)
-        throw option_not_found();
-    return opt->to<addr_list_type>();
+    return search_and_convert<addr_list_type>(type);
 }
 
 ICMPv6::rsa_sign_type ICMPv6::rsa_signature() const {
-    const option *opt = search_option(RSA_SIGN);
-    // 2 bytes reserved + at least 1 byte signature.
-    // 16 == sizeof(rsa_sign_type::key_hash), removed the sizeof
-    // expression since gcc 4.2 doesn't like it
-    if(!opt || opt->data_size() < 2 + 16 + 1)
-        throw option_not_found();
-    const uint8_t *ptr = opt->data_ptr() + 2;
-    rsa_sign_type output;
-    std::copy(ptr, ptr + sizeof(output.key_hash), output.key_hash);
-    ptr += sizeof(output.key_hash);
-    output.signature.assign(ptr, opt->data_ptr() + opt->data_size());
-    return output;
+    return search_and_convert<rsa_sign_type>(RSA_SIGN);
 }
 
-uint64_t ICMPv6::timestamp() const {
-    const option *opt = safe_search_option<std::less>(
-        TIMESTAMP, 6 + sizeof(uint64_t)
-    );
-    return Endian::be_to_host(*(uint64_t*)(opt->data_ptr() + 6));
+ICMPv6::timestamp_type ICMPv6::timestamp() const {
+    return search_and_convert<timestamp_type>(TIMESTAMP);
 }
 
 ICMPv6::nonce_type ICMPv6::nonce() const {
-    const option *opt = search_option(NONCE);
-    if(!opt)
-        throw option_not_found();
-    return opt->to<nonce_type>();
+    return search_and_convert<nonce_type>(NONCE);
 }
 
 ICMPv6::ip_prefix_type ICMPv6::ip_prefix() const {
-    const option *opt = safe_search_option<std::less>(
-        IP_PREFIX, 2
-    );
-    const uint8_t *ptr = opt->data_ptr();
-    ip_prefix_type output;
-    output.option_code = *ptr++;
-    output.prefix_len = *ptr++;
-    // skip padding
-    ptr += sizeof(uint32_t);
-    output.address = ipaddress_type(ptr);
-    return output;
+    return search_and_convert<ip_prefix_type>(IP_PREFIX);
 }   
 
 ICMPv6::lladdr_type ICMPv6::link_layer_addr() const {
-    const option *opt = search_option(LINK_ADDRESS);
-    if(!opt)
-        throw option_not_found();
-    return opt->to<lladdr_type>();
+    return search_and_convert<lladdr_type>(LINK_ADDRESS);
 }
 
 ICMPv6::naack_type ICMPv6::naack() const {
-    const option *opt = search_option(NAACK);
-    if(!opt)
-        throw option_not_found();
-    return opt->to<naack_type>();
+    return search_and_convert<naack_type>(NAACK);
 }
 
 ICMPv6::map_type ICMPv6::map() const {
-    const option *opt = safe_search_option<std::not_equal_to>(
-        MAP, 2 + sizeof(uint32_t) + ipaddress_type::address_size
-    );
-    const uint8_t *ptr = opt->data_ptr();
-    map_type output;
-    output.dist = (*ptr >> 4) & 0x0f;
-    output.pref = *ptr++ & 0x0f;
-    output.r = (*ptr++ >> 7) & 0x01;
-    output.valid_lifetime = *(uint32_t*)ptr;
-    ptr += sizeof(uint32_t);
-    output.address = ptr;
-    return output;
+    return search_and_convert<map_type>(MAP);
 }
 
 ICMPv6::route_info_type ICMPv6::route_info() const {
-    const option *opt = safe_search_option<std::less>(
-        ROUTE_INFO, 2 + sizeof(uint32_t)
-    );
-    const uint8_t *ptr = opt->data_ptr();
-    route_info_type output;
-    output.prefix_len = *ptr++;
-    output.pref = (*ptr++ >> 3) & 0x3;
-    output.route_lifetime = Endian::be_to_host(*(uint32_t*)ptr);
-    ptr += sizeof(uint32_t);
-    output.prefix.assign(ptr, opt->data_ptr() + opt->data_size());
-    return output;
+    return search_and_convert<route_info_type>(ROUTE_INFO);
 }
 
 ICMPv6::recursive_dns_type ICMPv6::recursive_dns_servers() const {
-    const option *opt = safe_search_option<std::less>(
-        RECURSIVE_DNS_SERV, 2 + sizeof(uint32_t) + ipaddress_type::address_size
-    );
-    const uint8_t *ptr = opt->data_ptr() + 2, *end = opt->data_ptr() + opt->data_size();
-    recursive_dns_type output;
-    output.lifetime = Endian::be_to_host(*(uint32_t*)ptr);
-    ptr += sizeof(uint32_t);
-    while(ptr < end) {
-        if(ptr + ipaddress_type::address_size > end)
-            throw option_not_found();
-        output.servers.push_back(ptr);
-        ptr += ipaddress_type::address_size;
-    }
-    return output;
+    return search_and_convert<recursive_dns_type>(RECURSIVE_DNS_SERV);
 }
 
 ICMPv6::handover_key_req_type ICMPv6::handover_key_request() const {
-    const option *opt = safe_search_option<std::less>(
-        HANDOVER_KEY_REQ, 2 + sizeof(uint32_t)
-    );
-    const uint8_t *ptr = opt->data_ptr() + 1, *end = opt->data_ptr() + opt->data_size();
-    handover_key_req_type output;
-    output.AT = (*ptr++ >> 4) & 0x3;
-    // is there enough size for the indicated padding?
-    if(end - ptr < *opt->data_ptr())
-        throw option_not_found();
-    output.key.assign(ptr, ptr + ((end - ptr) - *opt->data_ptr()));
-    return output;
+    return search_and_convert<handover_key_req_type>(HANDOVER_KEY_REQ);
 }
 
 ICMPv6::handover_key_reply_type ICMPv6::handover_key_reply() const {
-    const option *opt = safe_search_option<std::less>(
-        HANDOVER_KEY_REPLY, 2 + sizeof(uint32_t)
-    );
-    const uint8_t *ptr = opt->data_ptr() + 1, *end = opt->data_ptr() + opt->data_size();
-    handover_key_reply_type output;
-    output.AT = (*ptr++ >> 4) & 0x3;
-    output.lifetime = Endian::be_to_host(*(uint16_t*)ptr);
-    ptr += sizeof(uint16_t);
-    // is there enough size for the indicated padding?
-    if(end - ptr < *opt->data_ptr())
-        throw option_not_found();
-    output.key.assign(ptr, ptr + ((end - ptr) - *opt->data_ptr()));
-    return output;
+    return search_and_convert<handover_key_reply_type>(HANDOVER_KEY_REPLY);
 }
 
 ICMPv6::handover_assist_info_type ICMPv6::handover_assist_info() const {
-    const option *opt = safe_search_option<std::less>(
-        HANDOVER_ASSIST_INFO, 2
-    );
-    const uint8_t *ptr = opt->data_ptr(), *end = ptr + opt->data_size();
-    handover_assist_info_type output;
-    output.option_code = *ptr++;
-    if((end - ptr - 1) < *ptr)
-        throw option_not_found();
-    output.hai.assign(ptr + 1, ptr + 1 + *ptr);
-    return output;
+    return search_and_convert<handover_assist_info_type>(HANDOVER_ASSIST_INFO);
 }
 
 ICMPv6::mobile_node_id_type ICMPv6::mobile_node_identifier() const {
-    const option *opt = safe_search_option<std::less>(
-        MOBILE_NODE_ID, 2
-    );
-    const uint8_t *ptr = opt->data_ptr(), *end = ptr + opt->data_size();
-    mobile_node_id_type output;
-    output.option_code = *ptr++;
-    if((end - ptr - 1) < *ptr)
-        throw option_not_found();
-    output.mn.assign(ptr + 1, ptr + 1 + *ptr);
-    return output;
+    return search_and_convert<mobile_node_id_type>(MOBILE_NODE_ID);
 }
 
 ICMPv6::dns_search_list_type ICMPv6::dns_search_list() const {
-    const option *opt = safe_search_option<std::less>(
-        DNS_SEARCH_LIST, 2 + sizeof(uint32_t)
-    );
-    const uint8_t *ptr = opt->data_ptr(), *end = ptr + opt->data_size();
-    dns_search_list_type output;
-    output.lifetime = Endian::be_to_host(*(uint32_t*)(ptr + 2));
-    ptr += 2 + sizeof(uint32_t);
-    while(ptr < end && *ptr) {
-        std::string domain;
-        while(ptr < end && *ptr && *ptr < (end - ptr)) {
-            if(!domain.empty())
-                domain.push_back('.');
-            domain.insert(domain.end(), ptr + 1, ptr + *ptr + 1);
-            ptr += *ptr + 1;
-        }
-        // not enough size
-        if(ptr < end && *ptr != 0)
-            throw option_not_found();
-        output.domains.push_back(domain);
-        ptr++;
-    }
-    return output;
+    return search_and_convert<dns_search_list_type>(DNS_SEARCH_LIST);
 }
 
 // Options stuff
@@ -847,5 +701,171 @@ ICMPv6::prefix_info_type ICMPv6::prefix_info_type::from_option(const option &opt
     output.prefix = ptr + sizeof(uint32_t) * 2;
     return output;
 }
+
+ICMPv6::rsa_sign_type ICMPv6::rsa_sign_type::from_option(const option &opt)
+{
+    // 2 bytes reserved + at least 1 byte signature.
+    // 16 == sizeof(rsa_sign_type::key_hash), removed the sizeof
+    // expression since gcc 4.2 doesn't like it
+    if(opt.data_size() < 2 + 16 + 1)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr() + 2;
+    rsa_sign_type output;
+    std::copy(ptr, ptr + sizeof(output.key_hash), output.key_hash);
+    ptr += sizeof(output.key_hash);
+    output.signature.assign(ptr, opt.data_ptr() + opt.data_size());
+    return output;
+}
+
+ICMPv6::ip_prefix_type ICMPv6::ip_prefix_type::from_option(const option &opt)
+{
+    // 2 bytes + 4 padding + ipv6 address
+    if(opt.data_size() != 2 + 4 + ICMPv6::ipaddress_type::address_size)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
+    ip_prefix_type output;
+    output.option_code = *ptr++;
+    output.prefix_len = *ptr++;
+    // skip padding
+    ptr += sizeof(uint32_t);
+    output.address = ICMPv6::ipaddress_type(ptr);
+    return output;
+}
+
+ICMPv6::map_type ICMPv6::map_type::from_option(const option &opt)
+{
+    if(opt.data_size() != 2 + sizeof(uint32_t) + ipaddress_type::address_size)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
+    map_type output;
+    output.dist = (*ptr >> 4) & 0x0f;
+    output.pref = *ptr++ & 0x0f;
+    output.r = (*ptr++ >> 7) & 0x01;
+    output.valid_lifetime = *(uint32_t*)ptr;
+    ptr += sizeof(uint32_t);
+    output.address = ptr;
+    return output;
+}
+
+ICMPv6::route_info_type ICMPv6::route_info_type::from_option(const option &opt) 
+{
+    if(opt.data_size() < 2 + sizeof(uint32_t))
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr();
+    route_info_type output;
+    output.prefix_len = *ptr++;
+    output.pref = (*ptr++ >> 3) & 0x3;
+    output.route_lifetime = Endian::be_to_host(*(uint32_t*)ptr);
+    ptr += sizeof(uint32_t);
+    output.prefix.assign(ptr, opt.data_ptr() + opt.data_size());
+    return output;
+}
+
+ICMPv6::recursive_dns_type ICMPv6::recursive_dns_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2 + sizeof(uint32_t) + ICMPv6::ipaddress_type::address_size)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr() + 2, *end = opt.data_ptr() + opt.data_size();
+    recursive_dns_type output;
+    output.lifetime = Endian::be_to_host(*(uint32_t*)ptr);
+    ptr += sizeof(uint32_t);
+    while(ptr < end) {
+        if(ptr + ICMPv6::ipaddress_type::address_size > end)
+            throw option_not_found();
+        output.servers.push_back(ptr);
+        ptr += ICMPv6::ipaddress_type::address_size;
+    }
+    return output;
+}
+
+ICMPv6::handover_key_req_type ICMPv6::handover_key_req_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2 + sizeof(uint32_t))
+        throw option_not_found();
+    const uint8_t *ptr = opt.data_ptr() + 1, *end = opt.data_ptr() + opt.data_size();
+    handover_key_req_type output;
+    output.AT = (*ptr++ >> 4) & 0x3;
+    // is there enough size for the indicated padding?
+    if(end - ptr < *opt.data_ptr())
+        throw malformed_option();
+    output.key.assign(ptr, ptr + ((end - ptr) - *opt.data_ptr()));
+    return output;
+}
+
+ICMPv6::handover_key_reply_type ICMPv6::handover_key_reply_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2 + sizeof(uint32_t))
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr() + 1, *end = opt.data_ptr() + opt.data_size();
+    handover_key_reply_type output;
+    output.AT = (*ptr++ >> 4) & 0x3;
+    output.lifetime = Endian::be_to_host(*(uint16_t*)ptr);
+    ptr += sizeof(uint16_t);
+    // is there enough size for the indicated padding?
+    if(end - ptr < *opt.data_ptr())
+        throw malformed_option();
+    output.key.assign(ptr, ptr + ((end - ptr) - *opt.data_ptr()));
+    return output;
+}
+
+ICMPv6::handover_assist_info_type ICMPv6::handover_assist_info_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
+    handover_assist_info_type output;
+    output.option_code = *ptr++;
+    if((end - ptr - 1) < *ptr)
+        throw malformed_option();
+    output.hai.assign(ptr + 1, ptr + 1 + *ptr);
+    return output;
+}
+
+ICMPv6::mobile_node_id_type ICMPv6::mobile_node_id_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2)
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
+    mobile_node_id_type output;
+    output.option_code = *ptr++;
+    if((end - ptr - 1) < *ptr)
+        throw malformed_option();
+    output.mn.assign(ptr + 1, ptr + 1 + *ptr);
+    return output;
+}
+
+ICMPv6::dns_search_list_type ICMPv6::dns_search_list_type::from_option(const option &opt)
+{
+    if(opt.data_size() < 2 + sizeof(uint32_t))
+        throw malformed_option();
+    const uint8_t *ptr = opt.data_ptr(), *end = ptr + opt.data_size();
+    dns_search_list_type output;
+    output.lifetime = Endian::be_to_host(*(uint32_t*)(ptr + 2));
+    ptr += 2 + sizeof(uint32_t);
+    while(ptr < end && *ptr) {
+        std::string domain;
+        while(ptr < end && *ptr && *ptr < (end - ptr)) {
+            if(!domain.empty())
+                domain.push_back('.');
+            domain.insert(domain.end(), ptr + 1, ptr + *ptr + 1);
+            ptr += *ptr + 1;
+        }
+        // not enough size
+        if(ptr < end && *ptr != 0)
+            throw option_not_found();
+        output.domains.push_back(domain);
+        ptr++;
+    }
+    return output;
+}
+
+ICMPv6::timestamp_type ICMPv6::timestamp_type::from_option(const option &opt)
+{
+    if(opt.data_size() != 6 + sizeof(uint64_t))
+        throw malformed_option();
+    timestamp_type output(Endian::be_to_host(*(uint64_t*)(opt.data_ptr() + 6)));
+    std::copy(opt.data_ptr(), opt.data_ptr() + 6, output.reserved);
+    return output;
+}
 }
 
diff --git a/tests/depends.d b/tests/depends.d
index 1020dc8..6e5294d 100644
--- a/tests/depends.d
+++ b/tests/depends.d
@@ -29,6 +29,7 @@
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/hw_address.h ../include/ip_address.h \
  ../include/ip.h ../include/small_uint.h ../include/pdu_option.h \
+ ../include/internals.h ../include/constants.h ../include/ipv6_address.h \
  ../include/ethernetII.h ../include/rawpdu.h ../include/constants.h \
  ../include/network_interface.h ../include/exceptions.h
 
@@ -54,6 +55,12 @@
 
 ../include/pdu_option.h:
 
+../include/internals.h:
+
+../include/constants.h:
+
+../include/ipv6_address.h:
+
 ../include/ethernetII.h:
 
 ../include/rawpdu.h:
@@ -97,6 +104,11 @@
  ../include/dot11/../dot11/../config.h ../include/dot11/../dot11/../pdu.h \
  ../include/dot11/../dot11/../pdu_option.h \
  ../include/dot11/../dot11/../exceptions.h \
+ ../include/dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../endianness.h \
@@ -156,6 +168,16 @@
 
 ../include/dot11/../dot11/../exceptions.h:
 
+../include/dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../hw_address.h:
@@ -177,7 +199,9 @@
  ../include/macros.h ../include/dhcp.h ../include/bootp.h \
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/ip_address.h ../include/hw_address.h \
- ../include/pdu_option.h ../include/ethernetII.h ../include/exceptions.h
+ ../include/pdu_option.h ../include/internals.h ../include/constants.h \
+ ../include/ipv6_address.h ../include/ethernetII.h \
+ ../include/exceptions.h
 
 ../include/endianness.h:
 
@@ -201,13 +225,20 @@
 
 ../include/pdu_option.h:
 
+../include/internals.h:
+
+../include/constants.h:
+
+../include/ipv6_address.h:
+
 ../include/ethernetII.h:
 
 ../include/exceptions.h:
 ../src/dhcpv6.o: ../src/dhcpv6.cpp ../include/dhcpv6.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/small_uint.h \
- ../include/ipv6_address.h ../include/pdu_option.h \
+ ../include/ipv6_address.h ../include/pdu_option.h ../include/internals.h \
+ ../include/constants.h ../include/hw_address.h ../include/ip_address.h \
  ../include/exceptions.h
 
 ../include/dhcpv6.h:
@@ -228,6 +259,14 @@
 
 ../include/pdu_option.h:
 
+../include/internals.h:
+
+../include/constants.h:
+
+../include/hw_address.h:
+
+../include/ip_address.h:
+
 ../include/exceptions.h:
 ../src/dns.o: ../src/dns.cpp ../include/dns.h ../include/macros.h \
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
@@ -279,6 +318,13 @@
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -307,6 +353,20 @@
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -327,6 +387,13 @@
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -355,6 +422,20 @@
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -368,11 +449,14 @@
  ../include/dot11/dot11_base.h ../include/dot11/../config.h \
  ../include/dot11/../pdu.h ../include/dot11/../macros.h \
  ../include/dot11/../cxxstd.h ../include/dot11/../exceptions.h \
- ../include/dot11/../pdu_option.h ../include/dot11/../small_uint.h \
- ../include/dot11/../hw_address.h ../include/dot11/../endianness.h \
- ../include/dot11/../cxxstd.h ../include/dot11/../macros.h \
- ../include/macros.h ../include/exceptions.h ../include/dot11.h \
- ../include/config.h ../include/dot11/dot11_base.h \
+ ../include/dot11/../pdu_option.h ../include/dot11/../endianness.h \
+ ../include/dot11/../internals.h ../include/dot11/../constants.h \
+ ../include/dot11/../pdu.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../ip_address.h ../include/dot11/../ipv6_address.h \
+ ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
+ ../include/dot11/../macros.h ../include/macros.h ../include/exceptions.h \
+ ../include/dot11.h ../include/config.h ../include/dot11/dot11_base.h \
  ../include/dot11/dot11_data.h ../include/dot11/../dot11/dot11_base.h \
  ../include/dot11/../dot11/../config.h ../include/dot11/dot11_mgmt.h \
  ../include/dot11/dot11_beacon.h ../include/dot11/../dot11/dot11_mgmt.h \
@@ -381,7 +465,7 @@
  ../include/rawpdu.h ../include/pdu.h ../include/rsn_information.h \
  ../include/endianness.h ../include/packet_sender.h \
  ../include/network_interface.h ../include/hw_address.h \
- ../include/ip_address.h ../include/cxxstd.h ../include/macros.h \
+ ../include/ip_address.h ../include/macros.h ../include/cxxstd.h \
  ../include/snap.h ../include/small_uint.h
 
 ../include/dot11/dot11_base.h:
@@ -398,6 +482,20 @@
 
 ../include/dot11/../pdu_option.h:
 
+../include/dot11/../endianness.h:
+
+../include/dot11/../internals.h:
+
+../include/dot11/../constants.h:
+
+../include/dot11/../pdu.h:
+
+../include/dot11/../hw_address.h:
+
+../include/dot11/../ip_address.h:
+
+../include/dot11/../ipv6_address.h:
+
 ../include/dot11/../small_uint.h:
 
 ../include/dot11/../hw_address.h:
@@ -454,10 +552,10 @@
 
 ../include/ip_address.h:
 
-../include/cxxstd.h:
-
 ../include/macros.h:
 
+../include/cxxstd.h:
+
 ../include/snap.h:
 
 ../include/small_uint.h:
@@ -472,6 +570,13 @@
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -500,6 +605,20 @@
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -517,6 +636,13 @@
  ../include/dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../endianness.h \
@@ -541,6 +667,20 @@
 
 ../include/dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../hw_address.h:
@@ -558,6 +698,13 @@
  ../include/dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../endianness.h \
@@ -584,6 +731,20 @@
 
 ../include/dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../hw_address.h:
@@ -613,6 +774,13 @@
  ../include/dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../endianness.h \
@@ -638,6 +806,20 @@
 
 ../include/dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../hw_address.h:
@@ -662,6 +844,13 @@
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -690,6 +879,20 @@
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -784,9 +987,9 @@
  ../include/hw_address.h ../include/packet_sender.h \
  ../include/network_interface.h ../include/ip_address.h \
  ../include/rawpdu.h ../include/ip.h ../include/small_uint.h \
- ../include/pdu_option.h ../include/ipv6.h ../include/ipv6_address.h \
- ../include/arp.h ../include/constants.h ../include/internals.h \
- ../include/constants.h ../include/exceptions.h
+ ../include/pdu_option.h ../include/internals.h ../include/constants.h \
+ ../include/ipv6_address.h ../include/ipv6.h ../include/arp.h \
+ ../include/constants.h ../include/internals.h ../include/exceptions.h
 
 ../include/macros.h:
 
@@ -818,18 +1021,20 @@
 
 ../include/pdu_option.h:
 
-../include/ipv6.h:
+../include/internals.h:
+
+../include/constants.h:
 
 ../include/ipv6_address.h:
 
+../include/ipv6.h:
+
 ../include/arp.h:
 
 ../include/constants.h:
 
 ../include/internals.h:
 
-../include/constants.h:
-
 ../include/exceptions.h:
 ../src/handshake_capturer.o: ../src/handshake_capturer.cpp \
  ../include/handshake_capturer.h ../include/config.h \
@@ -841,6 +1046,14 @@
  ../include/dot11/../dot11/../config.h ../include/dot11/../dot11/../pdu.h \
  ../include/dot11/../dot11/../pdu_option.h \
  ../include/dot11/../dot11/../exceptions.h \
+ ../include/dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../cxxstd.h \
+ ../include/dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../endianness.h \
@@ -881,6 +1094,22 @@
 
 ../include/dot11/../dot11/../exceptions.h:
 
+../include/dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../cxxstd.h:
+
+../include/dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../hw_address.h:
@@ -892,10 +1121,9 @@
 ../include/dot11/../dot11/../macros.h:
 ../src/icmp.o: ../src/icmp.cpp ../include/icmp.h ../include/macros.h \
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
- ../include/endianness.h ../include/rawpdu.h ../include/utils.h \
- ../include/ip_address.h ../include/ipv6_address.h \
- ../include/hw_address.h ../include/internals.h ../include/constants.h \
- ../include/exceptions.h
+ ../include/endianness.h ../include/ip_address.h ../include/rawpdu.h \
+ ../include/utils.h ../include/ipv6_address.h ../include/hw_address.h \
+ ../include/internals.h ../include/constants.h ../include/exceptions.h
 
 ../include/icmp.h:
 
@@ -909,12 +1137,12 @@
 
 ../include/endianness.h:
 
+../include/ip_address.h:
+
 ../include/rawpdu.h:
 
 ../include/utils.h:
 
-../include/ip_address.h:
-
 ../include/ipv6_address.h:
 
 ../include/hw_address.h:
@@ -927,10 +1155,10 @@
 ../src/icmpv6.o: ../src/icmpv6.cpp ../include/icmpv6.h \
  ../include/macros.h ../include/pdu.h ../include/cxxstd.h \
  ../include/exceptions.h ../include/ipv6_address.h \
- ../include/pdu_option.h ../include/endianness.h ../include/small_uint.h \
- ../include/hw_address.h ../include/ipv6.h ../include/rawpdu.h \
- ../include/utils.h ../include/ip_address.h ../include/internals.h \
- ../include/constants.h ../include/constants.h ../include/exceptions.h
+ ../include/pdu_option.h ../include/endianness.h ../include/internals.h \
+ ../include/constants.h ../include/hw_address.h ../include/ip_address.h \
+ ../include/small_uint.h ../include/ipv6.h ../include/rawpdu.h \
+ ../include/utils.h ../include/constants.h ../include/exceptions.h
 
 ../include/icmpv6.h:
 
@@ -948,22 +1176,22 @@
 
 ../include/endianness.h:
 
-../include/small_uint.h:
+../include/internals.h:
+
+../include/constants.h:
 
 ../include/hw_address.h:
 
+../include/ip_address.h:
+
+../include/small_uint.h:
+
 ../include/ipv6.h:
 
 ../include/rawpdu.h:
 
 ../include/utils.h:
 
-../include/ip_address.h:
-
-../include/internals.h:
-
-../include/constants.h:
-
 ../include/constants.h:
 
 ../include/exceptions.h:
@@ -971,14 +1199,14 @@
  ../include/constants.h ../include/pdu.h ../include/macros.h \
  ../include/cxxstd.h ../include/exceptions.h ../include/hw_address.h \
  ../include/ip.h ../include/small_uint.h ../include/endianness.h \
- ../include/ip_address.h ../include/pdu_option.h ../include/ethernetII.h \
- ../include/ieee802_3.h ../include/dot3.h ../include/radiotap.h \
- ../include/config.h ../include/dot11/dot11_base.h \
- ../include/dot11/../config.h ../include/dot11/../pdu.h \
- ../include/dot11/../pdu_option.h ../include/dot11/../small_uint.h \
- ../include/dot11/../hw_address.h ../include/dot11/../endianness.h \
- ../include/dot11/../cxxstd.h ../include/dot11/../macros.h \
- ../include/ipv6.h ../include/ipv6_address.h ../include/tcp.h \
+ ../include/ip_address.h ../include/pdu_option.h ../include/internals.h \
+ ../include/ipv6_address.h ../include/ethernetII.h ../include/ieee802_3.h \
+ ../include/dot3.h ../include/radiotap.h ../include/config.h \
+ ../include/dot11/dot11_base.h ../include/dot11/../config.h \
+ ../include/dot11/../pdu.h ../include/dot11/../pdu_option.h \
+ ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
+ ../include/dot11/../macros.h ../include/ipv6.h ../include/tcp.h \
  ../include/udp.h ../include/ipsec.h ../include/icmp.h \
  ../include/icmpv6.h ../include/arp.h ../include/eapol.h \
  ../include/rawpdu.h ../include/dot1q.h ../include/pppoe.h \
@@ -1009,6 +1237,10 @@
 
 ../include/pdu_option.h:
 
+../include/internals.h:
+
+../include/ipv6_address.h:
+
 ../include/ethernetII.h:
 
 ../include/ieee802_3.h:
@@ -1039,8 +1271,6 @@
 
 ../include/ipv6.h:
 
-../include/ipv6_address.h:
-
 ../include/tcp.h:
 
 ../include/udp.h:
@@ -1069,9 +1299,9 @@
 ../src/ip.o: ../src/ip.cpp ../include/ip.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/small_uint.h ../include/endianness.h ../include/ip_address.h \
- ../include/pdu_option.h ../include/rawpdu.h ../include/utils.h \
- ../include/ipv6_address.h ../include/hw_address.h ../include/internals.h \
- ../include/constants.h ../include/packet_sender.h \
+ ../include/pdu_option.h ../include/internals.h ../include/constants.h \
+ ../include/hw_address.h ../include/ipv6_address.h ../include/rawpdu.h \
+ ../include/utils.h ../include/packet_sender.h \
  ../include/network_interface.h ../include/constants.h \
  ../include/network_interface.h ../include/exceptions.h \
  ../include/pdu_allocator.h
@@ -1094,18 +1324,18 @@
 
 ../include/pdu_option.h:
 
-../include/rawpdu.h:
-
-../include/utils.h:
-
-../include/ipv6_address.h:
-
-../include/hw_address.h:
-
 ../include/internals.h:
 
 ../include/constants.h:
 
+../include/hw_address.h:
+
+../include/ipv6_address.h:
+
+../include/rawpdu.h:
+
+../include/utils.h:
+
 ../include/packet_sender.h:
 
 ../include/network_interface.h:
@@ -1147,9 +1377,10 @@
 ../src/ip_reassembler.o: ../src/ip_reassembler.cpp ../include/ip.h \
  ../include/pdu.h ../include/macros.h ../include/cxxstd.h \
  ../include/exceptions.h ../include/small_uint.h ../include/endianness.h \
- ../include/ip_address.h ../include/pdu_option.h ../include/rawpdu.h \
- ../include/constants.h ../include/internals.h ../include/constants.h \
- ../include/hw_address.h ../include/ip_reassembler.h
+ ../include/ip_address.h ../include/pdu_option.h ../include/internals.h \
+ ../include/constants.h ../include/hw_address.h ../include/ipv6_address.h \
+ ../include/rawpdu.h ../include/constants.h ../include/internals.h \
+ ../include/ip_reassembler.h
 
 ../include/ip.h:
 
@@ -1169,16 +1400,20 @@
 
 ../include/pdu_option.h:
 
-../include/rawpdu.h:
-
-../include/constants.h:
-
 ../include/internals.h:
 
 ../include/constants.h:
 
 ../include/hw_address.h:
 
+../include/ipv6_address.h:
+
+../include/rawpdu.h:
+
+../include/constants.h:
+
+../include/internals.h:
+
 ../include/ip_reassembler.h:
 ../src/ipsec.o: ../src/ipsec.cpp ../include/ipsec.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
@@ -1209,11 +1444,11 @@
 ../src/ipv6.o: ../src/ipv6.cpp ../include/ipv6.h ../include/macros.h \
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/small_uint.h ../include/pdu_option.h \
- ../include/ipv6_address.h ../include/constants.h \
+ ../include/internals.h ../include/constants.h ../include/hw_address.h \
+ ../include/ip_address.h ../include/ipv6_address.h ../include/constants.h \
  ../include/packet_sender.h ../include/network_interface.h \
- ../include/hw_address.h ../include/ip_address.h ../include/rawpdu.h \
- ../include/exceptions.h ../include/pdu_allocator.h \
- ../include/internals.h ../include/constants.h
+ ../include/rawpdu.h ../include/exceptions.h ../include/pdu_allocator.h \
+ ../include/internals.h
 
 ../include/ipv6.h:
 
@@ -1231,6 +1466,14 @@
 
 ../include/pdu_option.h:
 
+../include/internals.h:
+
+../include/constants.h:
+
+../include/hw_address.h:
+
+../include/ip_address.h:
+
 ../include/ipv6_address.h:
 
 ../include/constants.h:
@@ -1239,10 +1482,6 @@
 
 ../include/network_interface.h:
 
-../include/hw_address.h:
-
-../include/ip_address.h:
-
 ../include/rawpdu.h:
 
 ../include/exceptions.h:
@@ -1250,8 +1489,6 @@
 ../include/pdu_allocator.h:
 
 ../include/internals.h:
-
-../include/constants.h:
 ../src/ipv6_address.o: ../src/ipv6_address.cpp ../include/macros.h \
  ../include/ipv6_address.h ../include/cxxstd.h ../include/address_range.h \
  ../include/endianness.h ../include/macros.h ../include/internals.h \
@@ -1310,7 +1547,8 @@
  ../include/exceptions.h ../include/packet_sender.h \
  ../include/network_interface.h ../include/hw_address.h \
  ../include/ip_address.h ../include/ip.h ../include/small_uint.h \
- ../include/endianness.h ../include/pdu_option.h ../include/llc.h \
+ ../include/endianness.h ../include/pdu_option.h ../include/internals.h \
+ ../include/constants.h ../include/ipv6_address.h ../include/llc.h \
  ../include/rawpdu.h ../include/exceptions.h
 
 ../include/loopback.h:
@@ -1339,6 +1577,12 @@
 
 ../include/pdu_option.h:
 
+../include/internals.h:
+
+../include/constants.h:
+
+../include/ipv6_address.h:
+
 ../include/llc.h:
 
 ../include/rawpdu.h:
@@ -1385,10 +1629,14 @@
  ../include/radiotap.h ../include/config.h ../include/dot11/dot11_base.h \
  ../include/dot11/../config.h ../include/dot11/../pdu.h \
  ../include/dot11/../pdu_option.h ../include/dot11/../exceptions.h \
+ ../include/dot11/../endianness.h ../include/dot11/../internals.h \
+ ../include/dot11/../constants.h ../include/dot11/../pdu.h \
+ ../include/dot11/../hw_address.h ../include/dot11/../ip_address.h \
+ ../include/dot11/../ipv6_address.h ../include/dot11/../cxxstd.h \
  ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
  ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
  ../include/dot11/../macros.h ../include/ieee802_3.h ../include/dot3.h \
- ../include/internals.h ../include/constants.h
+ ../include/internals.h
 
 ../include/packet_sender.h:
 
@@ -1430,6 +1678,22 @@
 
 ../include/dot11/../exceptions.h:
 
+../include/dot11/../endianness.h:
+
+../include/dot11/../internals.h:
+
+../include/dot11/../constants.h:
+
+../include/dot11/../pdu.h:
+
+../include/dot11/../hw_address.h:
+
+../include/dot11/../ip_address.h:
+
+../include/dot11/../ipv6_address.h:
+
+../include/dot11/../cxxstd.h:
+
 ../include/dot11/../small_uint.h:
 
 ../include/dot11/../hw_address.h:
@@ -1445,8 +1709,6 @@
 ../include/dot3.h:
 
 ../include/internals.h:
-
-../include/constants.h:
 ../src/packet_writer.o: ../src/packet_writer.cpp \
  ../include/packet_writer.h ../include/utils.h ../include/macros.h \
  ../include/ip_address.h ../include/cxxstd.h ../include/ipv6_address.h \
@@ -1505,14 +1767,17 @@
  ../include/dot11/../config.h ../include/dot11/../pdu.h \
  ../include/dot11/../macros.h ../include/dot11/../cxxstd.h \
  ../include/dot11/../exceptions.h ../include/dot11/../pdu_option.h \
- ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
- ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
- ../include/dot11/../macros.h ../include/dot3.h ../include/macros.h \
- ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
- ../include/ethernetII.h ../include/radiotap.h ../include/config.h \
- ../include/loopback.h ../include/sll.h ../include/ppi.h \
- ../include/small_uint.h ../include/internals.h ../include/constants.h \
- ../include/exceptions.h
+ ../include/dot11/../endianness.h ../include/dot11/../internals.h \
+ ../include/dot11/../constants.h ../include/dot11/../pdu.h \
+ ../include/dot11/../hw_address.h ../include/dot11/../ip_address.h \
+ ../include/dot11/../ipv6_address.h ../include/dot11/../small_uint.h \
+ ../include/dot11/../hw_address.h ../include/dot11/../endianness.h \
+ ../include/dot11/../cxxstd.h ../include/dot11/../macros.h \
+ ../include/dot3.h ../include/macros.h ../include/pdu.h \
+ ../include/endianness.h ../include/hw_address.h ../include/ethernetII.h \
+ ../include/radiotap.h ../include/config.h ../include/loopback.h \
+ ../include/sll.h ../include/ppi.h ../include/small_uint.h \
+ ../include/internals.h ../include/exceptions.h
 
 ../include/dot11/dot11_base.h:
 
@@ -1528,6 +1793,20 @@
 
 ../include/dot11/../pdu_option.h:
 
+../include/dot11/../endianness.h:
+
+../include/dot11/../internals.h:
+
+../include/dot11/../constants.h:
+
+../include/dot11/../pdu.h:
+
+../include/dot11/../hw_address.h:
+
+../include/dot11/../ip_address.h:
+
+../include/dot11/../ipv6_address.h:
+
 ../include/dot11/../small_uint.h:
 
 ../include/dot11/../hw_address.h:
@@ -1564,12 +1843,12 @@
 
 ../include/internals.h:
 
-../include/constants.h:
-
 ../include/exceptions.h:
 ../src/pppoe.o: ../src/pppoe.cpp ../include/pppoe.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/small_uint.h ../include/pdu_option.h \
+ ../include/internals.h ../include/constants.h ../include/hw_address.h \
+ ../include/ip_address.h ../include/ipv6_address.h \
  ../include/exceptions.h
 
 ../include/pppoe.h:
@@ -1588,6 +1867,16 @@
 
 ../include/pdu_option.h:
 
+../include/internals.h:
+
+../include/constants.h:
+
+../include/hw_address.h:
+
+../include/ip_address.h:
+
+../include/ipv6_address.h:
+
 ../include/exceptions.h:
 ../src/radiotap.o: ../src/radiotap.cpp ../include/radiotap.h \
  ../include/config.h ../include/macros.h ../include/pdu.h \
@@ -1595,11 +1884,14 @@
  ../include/macros.h ../include/dot11/dot11_base.h \
  ../include/dot11/../config.h ../include/dot11/../pdu.h \
  ../include/dot11/../pdu_option.h ../include/dot11/../exceptions.h \
+ ../include/dot11/../endianness.h ../include/dot11/../internals.h \
+ ../include/dot11/../constants.h ../include/dot11/../pdu.h \
+ ../include/dot11/../hw_address.h ../include/dot11/../cxxstd.h \
+ ../include/dot11/../ip_address.h ../include/dot11/../ipv6_address.h \
  ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
- ../include/dot11/../cxxstd.h ../include/dot11/../endianness.h \
- ../include/dot11/../cxxstd.h ../include/dot11/../macros.h \
- ../include/utils.h ../include/ip_address.h ../include/ipv6_address.h \
- ../include/hw_address.h ../include/internals.h ../include/constants.h \
+ ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
+ ../include/dot11/../macros.h ../include/utils.h ../include/ip_address.h \
+ ../include/ipv6_address.h ../include/hw_address.h ../include/internals.h \
  ../include/packet_sender.h ../include/network_interface.h \
  ../include/exceptions.h
 
@@ -1629,12 +1921,26 @@
 
 ../include/dot11/../exceptions.h:
 
-../include/dot11/../small_uint.h:
+../include/dot11/../endianness.h:
+
+../include/dot11/../internals.h:
+
+../include/dot11/../constants.h:
+
+../include/dot11/../pdu.h:
 
 ../include/dot11/../hw_address.h:
 
 ../include/dot11/../cxxstd.h:
 
+../include/dot11/../ip_address.h:
+
+../include/dot11/../ipv6_address.h:
+
+../include/dot11/../small_uint.h:
+
+../include/dot11/../hw_address.h:
+
 ../include/dot11/../endianness.h:
 
 ../include/dot11/../cxxstd.h:
@@ -1651,8 +1957,6 @@
 
 ../include/internals.h:
 
-../include/constants.h:
-
 ../include/packet_sender.h:
 
 ../include/network_interface.h:
@@ -1709,8 +2013,9 @@
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/small_uint.h ../include/constants.h \
  ../include/arp.h ../include/hw_address.h ../include/ip_address.h \
- ../include/ip.h ../include/pdu_option.h ../include/eapol.h \
- ../include/internals.h ../include/constants.h ../include/exceptions.h
+ ../include/ip.h ../include/pdu_option.h ../include/internals.h \
+ ../include/constants.h ../include/ipv6_address.h ../include/eapol.h \
+ ../include/internals.h ../include/exceptions.h
 
 ../include/snap.h:
 
@@ -1738,12 +2043,16 @@
 
 ../include/pdu_option.h:
 
-../include/eapol.h:
-
 ../include/internals.h:
 
 ../include/constants.h:
 
+../include/ipv6_address.h:
+
+../include/eapol.h:
+
+../include/internals.h:
+
 ../include/exceptions.h:
 ../src/sniffer.o: ../src/sniffer.cpp ../include/sniffer.h \
  ../include/pdu.h ../include/macros.h ../include/cxxstd.h \
@@ -1751,9 +2060,12 @@
  ../include/internals.h ../include/constants.h ../include/hw_address.h \
  ../include/dot11/dot11_base.h ../include/dot11/../config.h \
  ../include/dot11/../pdu.h ../include/dot11/../pdu_option.h \
- ../include/dot11/../exceptions.h ../include/dot11/../small_uint.h \
- ../include/dot11/../hw_address.h ../include/dot11/../endianness.h \
- ../include/dot11/../macros.h ../include/dot11/../cxxstd.h \
+ ../include/dot11/../exceptions.h ../include/dot11/../endianness.h \
+ ../include/dot11/../macros.h ../include/dot11/../internals.h \
+ ../include/dot11/../ip_address.h ../include/dot11/../cxxstd.h \
+ ../include/dot11/../hw_address.h ../include/dot11/../ipv6_address.h \
+ ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
  ../include/dot11/../macros.h ../include/ethernetII.h \
  ../include/endianness.h ../include/radiotap.h ../include/config.h \
  ../include/loopback.h ../include/dot3.h ../include/sll.h \
@@ -1789,14 +2101,26 @@
 
 ../include/dot11/../exceptions.h:
 
+../include/dot11/../endianness.h:
+
+../include/dot11/../macros.h:
+
+../include/dot11/../internals.h:
+
+../include/dot11/../ip_address.h:
+
+../include/dot11/../cxxstd.h:
+
+../include/dot11/../hw_address.h:
+
+../include/dot11/../ipv6_address.h:
+
 ../include/dot11/../small_uint.h:
 
 ../include/dot11/../hw_address.h:
 
 ../include/dot11/../endianness.h:
 
-../include/dot11/../macros.h:
-
 ../include/dot11/../cxxstd.h:
 
 ../include/dot11/../macros.h:
@@ -1843,10 +2167,10 @@
 ../src/tcp.o: ../src/tcp.cpp ../include/tcp.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/small_uint.h ../include/pdu_option.h \
- ../include/ip.h ../include/ip_address.h ../include/ipv6.h \
- ../include/ipv6_address.h ../include/constants.h ../include/rawpdu.h \
- ../include/utils.h ../include/hw_address.h ../include/internals.h \
- ../include/constants.h ../include/exceptions.h
+ ../include/internals.h ../include/constants.h ../include/hw_address.h \
+ ../include/ip_address.h ../include/ipv6_address.h ../include/ip.h \
+ ../include/ipv6.h ../include/constants.h ../include/rawpdu.h \
+ ../include/utils.h ../include/exceptions.h
 
 ../include/tcp.h:
 
@@ -1864,26 +2188,26 @@
 
 ../include/pdu_option.h:
 
-../include/ip.h:
+../include/internals.h:
+
+../include/constants.h:
+
+../include/hw_address.h:
 
 ../include/ip_address.h:
 
-../include/ipv6.h:
-
 ../include/ipv6_address.h:
 
+../include/ip.h:
+
+../include/ipv6.h:
+
 ../include/constants.h:
 
 ../include/rawpdu.h:
 
 ../include/utils.h:
 
-../include/hw_address.h:
-
-../include/internals.h:
-
-../include/constants.h:
-
 ../include/exceptions.h:
 ../src/tcp_stream.o: ../src/tcp_stream.cpp ../include/rawpdu.h \
  ../include/pdu.h ../include/macros.h ../include/cxxstd.h \
@@ -1891,7 +2215,7 @@
  ../include/packet.h ../include/timestamp.h ../include/internals.h \
  ../include/constants.h ../include/hw_address.h ../include/tcp.h \
  ../include/endianness.h ../include/small_uint.h ../include/pdu_option.h \
- ../include/utils.h ../include/ip_address.h ../include/ipv6_address.h \
+ ../include/ip_address.h ../include/ipv6_address.h ../include/utils.h \
  ../include/ip.h
 
 ../include/rawpdu.h:
@@ -1926,12 +2250,12 @@
 
 ../include/pdu_option.h:
 
-../include/utils.h:
-
 ../include/ip_address.h:
 
 ../include/ipv6_address.h:
 
+../include/utils.h:
+
 ../include/ip.h:
 ../src/udp.o: ../src/udp.cpp ../include/udp.h ../include/macros.h \
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
@@ -2056,8 +2380,8 @@ src/allocators.o: src/allocators.cpp ../include/pdu_allocator.h \
  ../include/exceptions.h ../include/ethernetII.h ../include/endianness.h \
  ../include/hw_address.h ../include/snap.h ../include/small_uint.h \
  ../include/sll.h ../include/dot1q.h ../include/ip.h \
- ../include/ip_address.h ../include/pdu_option.h ../include/ipv6.h \
- ../include/ipv6_address.h
+ ../include/ip_address.h ../include/pdu_option.h ../include/internals.h \
+ ../include/constants.h ../include/ipv6_address.h ../include/ipv6.h
 
 ../include/pdu_allocator.h:
 
@@ -2089,9 +2413,13 @@ src/allocators.o: src/allocators.cpp ../include/pdu_allocator.h \
 
 ../include/pdu_option.h:
 
-../include/ipv6.h:
+../include/internals.h:
+
+../include/constants.h:
 
 ../include/ipv6_address.h:
+
+../include/ipv6.h:
 src/arp.o: src/arp.cpp ../include/arp.h ../include/macros.h \
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/hw_address.h ../include/ip_address.h \
@@ -2126,8 +2454,8 @@ src/arp.o: src/arp.cpp ../include/arp.h ../include/macros.h \
 src/dhcp.o: src/dhcp.cpp ../include/dhcp.h ../include/bootp.h \
  ../include/pdu.h ../include/macros.h ../include/cxxstd.h \
  ../include/exceptions.h ../include/endianness.h ../include/ip_address.h \
- ../include/hw_address.h ../include/pdu_option.h ../include/utils.h \
- ../include/ipv6_address.h ../include/internals.h ../include/constants.h \
+ ../include/hw_address.h ../include/pdu_option.h ../include/internals.h \
+ ../include/constants.h ../include/ipv6_address.h ../include/utils.h \
  ../include/ethernetII.h ../include/hw_address.h ../include/ip_address.h
 
 ../include/dhcp.h:
@@ -2150,14 +2478,14 @@ src/dhcp.o: src/dhcp.cpp ../include/dhcp.h ../include/bootp.h \
 
 ../include/pdu_option.h:
 
-../include/utils.h:
-
-../include/ipv6_address.h:
-
 ../include/internals.h:
 
 ../include/constants.h:
 
+../include/ipv6_address.h:
+
+../include/utils.h:
+
 ../include/ethernetII.h:
 
 ../include/hw_address.h:
@@ -2166,7 +2494,8 @@ src/dhcp.o: src/dhcp.cpp ../include/dhcp.h ../include/bootp.h \
 src/dhcpv6.o: src/dhcpv6.cpp ../include/dhcpv6.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/small_uint.h \
- ../include/ipv6_address.h ../include/pdu_option.h
+ ../include/ipv6_address.h ../include/pdu_option.h ../include/internals.h \
+ ../include/constants.h ../include/hw_address.h ../include/ip_address.h
 
 ../include/dhcpv6.h:
 
@@ -2185,6 +2514,14 @@ src/dhcpv6.o: src/dhcpv6.cpp ../include/dhcpv6.h ../include/pdu.h \
 ../include/ipv6_address.h:
 
 ../include/pdu_option.h:
+
+../include/internals.h:
+
+../include/constants.h:
+
+../include/hw_address.h:
+
+../include/ip_address.h:
 src/dns.o: src/dns.cpp ../include/dns.h ../include/macros.h \
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/dns_record.h \
@@ -2226,6 +2563,13 @@ src/dot11/ack.o: src/dot11/ack.cpp ../include/dot11/dot11_control.h \
  ../include/dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../endianness.h \
@@ -2251,6 +2595,20 @@ src/dot11/ack.o: src/dot11/ack.cpp ../include/dot11/dot11_control.h \
 
 ../include/dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../hw_address.h:
@@ -2275,6 +2633,13 @@ src/dot11/assoc_request.o: src/dot11/assoc_request.cpp \
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -2305,6 +2670,20 @@ src/dot11/assoc_request.o: src/dot11/assoc_request.cpp \
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -2333,6 +2712,13 @@ src/dot11/assoc_response.o: src/dot11/assoc_response.cpp \
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -2363,6 +2749,20 @@ src/dot11/assoc_response.o: src/dot11/assoc_response.cpp \
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -2391,6 +2791,13 @@ src/dot11/authentication.o: src/dot11/authentication.cpp \
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -2421,6 +2828,20 @@ src/dot11/authentication.o: src/dot11/authentication.cpp \
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -2448,6 +2869,13 @@ src/dot11/beacon.o: src/dot11/beacon.cpp ../include/dot11/dot11_beacon.h \
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -2479,6 +2907,20 @@ src/dot11/beacon.o: src/dot11/beacon.cpp ../include/dot11/dot11_beacon.h \
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -2508,6 +2950,13 @@ src/dot11/block_ack_request.o: src/dot11/block_ack_request.cpp \
  ../include/dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../endianness.h \
@@ -2533,6 +2982,20 @@ src/dot11/block_ack_request.o: src/dot11/block_ack_request.cpp \
 
 ../include/dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../hw_address.h:
@@ -2551,10 +3014,14 @@ src/dot11/cfend.o: src/dot11/cfend.cpp ../include/config.h \
  ../include/dot11/dot11_base.h ../include/dot11/../config.h \
  ../include/dot11/../pdu.h ../include/dot11/../macros.h \
  ../include/dot11/../cxxstd.h ../include/dot11/../exceptions.h \
- ../include/dot11/../pdu_option.h ../include/dot11/../small_uint.h \
- ../include/dot11/../hw_address.h ../include/dot11/../endianness.h \
- ../include/dot11/../cxxstd.h ../include/dot11/../macros.h \
- ../include/dot11/dot11_control.h ../include/dot11/../dot11/dot11_base.h \
+ ../include/dot11/../pdu_option.h ../include/dot11/../endianness.h \
+ ../include/dot11/../internals.h ../include/dot11/../constants.h \
+ ../include/dot11/../pdu.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../ip_address.h ../include/dot11/../ipv6_address.h \
+ ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
+ ../include/dot11/../macros.h ../include/dot11/dot11_control.h \
+ ../include/dot11/../dot11/dot11_base.h \
  ../include/dot11/../dot11/../config.h
 
 ../include/config.h:
@@ -2577,6 +3044,20 @@ include/tests/dot11.h:
 
 ../include/dot11/../pdu_option.h:
 
+../include/dot11/../endianness.h:
+
+../include/dot11/../internals.h:
+
+../include/dot11/../constants.h:
+
+../include/dot11/../pdu.h:
+
+../include/dot11/../hw_address.h:
+
+../include/dot11/../ip_address.h:
+
+../include/dot11/../ipv6_address.h:
+
 ../include/dot11/../small_uint.h:
 
 ../include/dot11/../hw_address.h:
@@ -2597,10 +3078,14 @@ src/dot11/cfendack.o: src/dot11/cfendack.cpp ../include/config.h \
  ../include/dot11/dot11_base.h ../include/dot11/../config.h \
  ../include/dot11/../pdu.h ../include/dot11/../macros.h \
  ../include/dot11/../cxxstd.h ../include/dot11/../exceptions.h \
- ../include/dot11/../pdu_option.h ../include/dot11/../small_uint.h \
- ../include/dot11/../hw_address.h ../include/dot11/../endianness.h \
- ../include/dot11/../cxxstd.h ../include/dot11/../macros.h \
- ../include/dot11/dot11_control.h ../include/dot11/../dot11/dot11_base.h \
+ ../include/dot11/../pdu_option.h ../include/dot11/../endianness.h \
+ ../include/dot11/../internals.h ../include/dot11/../constants.h \
+ ../include/dot11/../pdu.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../ip_address.h ../include/dot11/../ipv6_address.h \
+ ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
+ ../include/dot11/../macros.h ../include/dot11/dot11_control.h \
+ ../include/dot11/../dot11/dot11_base.h \
  ../include/dot11/../dot11/../config.h
 
 ../include/config.h:
@@ -2623,6 +3108,20 @@ include/tests/dot11.h:
 
 ../include/dot11/../pdu_option.h:
 
+../include/dot11/../endianness.h:
+
+../include/dot11/../internals.h:
+
+../include/dot11/../constants.h:
+
+../include/dot11/../pdu.h:
+
+../include/dot11/../hw_address.h:
+
+../include/dot11/../ip_address.h:
+
+../include/dot11/../ipv6_address.h:
+
 ../include/dot11/../small_uint.h:
 
 ../include/dot11/../hw_address.h:
@@ -2643,10 +3142,14 @@ src/dot11/data.o: src/dot11/data.cpp ../include/config.h \
  ../include/dot11/dot11_base.h ../include/dot11/../config.h \
  ../include/dot11/../pdu.h ../include/dot11/../macros.h \
  ../include/dot11/../cxxstd.h ../include/dot11/../exceptions.h \
- ../include/dot11/../pdu_option.h ../include/dot11/../small_uint.h \
- ../include/dot11/../hw_address.h ../include/dot11/../endianness.h \
- ../include/dot11/../cxxstd.h ../include/dot11/../macros.h \
- ../include/dot11/dot11_data.h ../include/dot11/../dot11/dot11_base.h \
+ ../include/dot11/../pdu_option.h ../include/dot11/../endianness.h \
+ ../include/dot11/../internals.h ../include/dot11/../constants.h \
+ ../include/dot11/../pdu.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../ip_address.h ../include/dot11/../ipv6_address.h \
+ ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
+ ../include/dot11/../macros.h ../include/dot11/dot11_data.h \
+ ../include/dot11/../dot11/dot11_base.h \
  ../include/dot11/../dot11/../config.h
 
 ../include/config.h:
@@ -2669,6 +3172,20 @@ include/tests/dot11.h:
 
 ../include/dot11/../pdu_option.h:
 
+../include/dot11/../endianness.h:
+
+../include/dot11/../internals.h:
+
+../include/dot11/../constants.h:
+
+../include/dot11/../pdu.h:
+
+../include/dot11/../hw_address.h:
+
+../include/dot11/../ip_address.h:
+
+../include/dot11/../ipv6_address.h:
+
 ../include/dot11/../small_uint.h:
 
 ../include/dot11/../hw_address.h:
@@ -2695,6 +3212,13 @@ src/dot11/deauthentication.o: src/dot11/deauthentication.cpp \
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -2725,6 +3249,20 @@ src/dot11/deauthentication.o: src/dot11/deauthentication.cpp \
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -2753,6 +3291,13 @@ src/dot11/disassoc.o: src/dot11/disassoc.cpp \
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -2783,6 +3328,20 @@ src/dot11/disassoc.o: src/dot11/disassoc.cpp \
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -2805,12 +3364,14 @@ src/dot11/dot11.o: src/dot11/dot11.cpp ../include/config.h \
  ../include/dot11/../config.h ../include/dot11/../pdu.h \
  ../include/dot11/../macros.h ../include/dot11/../cxxstd.h \
  ../include/dot11/../exceptions.h ../include/dot11/../pdu_option.h \
- ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
- ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
- ../include/dot11/../macros.h ../include/utils.h ../include/macros.h \
- ../include/ip_address.h ../include/cxxstd.h ../include/ipv6_address.h \
- ../include/hw_address.h ../include/internals.h ../include/constants.h \
- ../include/pdu.h
+ ../include/dot11/../endianness.h ../include/dot11/../internals.h \
+ ../include/dot11/../constants.h ../include/dot11/../pdu.h \
+ ../include/dot11/../hw_address.h ../include/dot11/../ip_address.h \
+ ../include/dot11/../ipv6_address.h ../include/dot11/../small_uint.h \
+ ../include/dot11/../hw_address.h ../include/dot11/../endianness.h \
+ ../include/dot11/../cxxstd.h ../include/dot11/../macros.h \
+ ../include/utils.h ../include/macros.h ../include/ip_address.h \
+ ../include/ipv6_address.h ../include/hw_address.h ../include/internals.h
 
 ../include/config.h:
 
@@ -2830,6 +3391,20 @@ include/tests/dot11.h:
 
 ../include/dot11/../pdu_option.h:
 
+../include/dot11/../endianness.h:
+
+../include/dot11/../internals.h:
+
+../include/dot11/../constants.h:
+
+../include/dot11/../pdu.h:
+
+../include/dot11/../hw_address.h:
+
+../include/dot11/../ip_address.h:
+
+../include/dot11/../ipv6_address.h:
+
 ../include/dot11/../small_uint.h:
 
 ../include/dot11/../hw_address.h:
@@ -2846,17 +3421,11 @@ include/tests/dot11.h:
 
 ../include/ip_address.h:
 
-../include/cxxstd.h:
-
 ../include/ipv6_address.h:
 
 ../include/hw_address.h:
 
 ../include/internals.h:
-
-../include/constants.h:
-
-../include/pdu.h:
 src/dot11/probe_request.o: src/dot11/probe_request.cpp \
  ../include/dot11/dot11_probe.h ../include/dot11/../config.h \
  ../include/dot11/../dot11/dot11_mgmt.h \
@@ -2868,6 +3437,13 @@ src/dot11/probe_request.o: src/dot11/probe_request.cpp \
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -2898,6 +3474,20 @@ src/dot11/probe_request.o: src/dot11/probe_request.cpp \
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -2926,6 +3516,13 @@ src/dot11/probe_response.o: src/dot11/probe_response.cpp \
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -2956,6 +3553,20 @@ src/dot11/probe_response.o: src/dot11/probe_response.cpp \
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -2978,10 +3589,14 @@ src/dot11/pspoll.o: src/dot11/pspoll.cpp ../include/config.h \
  ../include/dot11/dot11_base.h ../include/dot11/../config.h \
  ../include/dot11/../pdu.h ../include/dot11/../macros.h \
  ../include/dot11/../cxxstd.h ../include/dot11/../exceptions.h \
- ../include/dot11/../pdu_option.h ../include/dot11/../small_uint.h \
- ../include/dot11/../hw_address.h ../include/dot11/../endianness.h \
- ../include/dot11/../cxxstd.h ../include/dot11/../macros.h \
- ../include/dot11/dot11_control.h ../include/dot11/../dot11/dot11_base.h \
+ ../include/dot11/../pdu_option.h ../include/dot11/../endianness.h \
+ ../include/dot11/../internals.h ../include/dot11/../constants.h \
+ ../include/dot11/../pdu.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../ip_address.h ../include/dot11/../ipv6_address.h \
+ ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
+ ../include/dot11/../macros.h ../include/dot11/dot11_control.h \
+ ../include/dot11/../dot11/dot11_base.h \
  ../include/dot11/../dot11/../config.h
 
 ../include/config.h:
@@ -3004,6 +3619,20 @@ include/tests/dot11.h:
 
 ../include/dot11/../pdu_option.h:
 
+../include/dot11/../endianness.h:
+
+../include/dot11/../internals.h:
+
+../include/dot11/../constants.h:
+
+../include/dot11/../pdu.h:
+
+../include/dot11/../hw_address.h:
+
+../include/dot11/../ip_address.h:
+
+../include/dot11/../ipv6_address.h:
+
 ../include/dot11/../small_uint.h:
 
 ../include/dot11/../hw_address.h:
@@ -3030,6 +3659,13 @@ src/dot11/reassoc_request.o: src/dot11/reassoc_request.cpp \
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -3060,6 +3696,20 @@ src/dot11/reassoc_request.o: src/dot11/reassoc_request.cpp \
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -3088,6 +3738,13 @@ src/dot11/reassoc_response.o: src/dot11/reassoc_response.cpp \
  ../include/dot11/../dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../dot11/../endianness.h \
@@ -3118,6 +3775,20 @@ src/dot11/reassoc_response.o: src/dot11/reassoc_response.cpp \
 
 ../include/dot11/../dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../dot11/../hw_address.h:
@@ -3140,10 +3811,14 @@ src/dot11/rts.o: src/dot11/rts.cpp ../include/config.h \
  ../include/dot11/dot11_base.h ../include/dot11/../config.h \
  ../include/dot11/../pdu.h ../include/dot11/../macros.h \
  ../include/dot11/../cxxstd.h ../include/dot11/../exceptions.h \
- ../include/dot11/../pdu_option.h ../include/dot11/../small_uint.h \
- ../include/dot11/../hw_address.h ../include/dot11/../endianness.h \
- ../include/dot11/../cxxstd.h ../include/dot11/../macros.h \
- ../include/dot11/dot11_control.h ../include/dot11/../dot11/dot11_base.h \
+ ../include/dot11/../pdu_option.h ../include/dot11/../endianness.h \
+ ../include/dot11/../internals.h ../include/dot11/../constants.h \
+ ../include/dot11/../pdu.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../ip_address.h ../include/dot11/../ipv6_address.h \
+ ../include/dot11/../small_uint.h ../include/dot11/../hw_address.h \
+ ../include/dot11/../endianness.h ../include/dot11/../cxxstd.h \
+ ../include/dot11/../macros.h ../include/dot11/dot11_control.h \
+ ../include/dot11/../dot11/dot11_base.h \
  ../include/dot11/../dot11/../config.h
 
 ../include/config.h:
@@ -3166,6 +3841,20 @@ include/tests/dot11.h:
 
 ../include/dot11/../pdu_option.h:
 
+../include/dot11/../endianness.h:
+
+../include/dot11/../internals.h:
+
+../include/dot11/../constants.h:
+
+../include/dot11/../pdu.h:
+
+../include/dot11/../hw_address.h:
+
+../include/dot11/../ip_address.h:
+
+../include/dot11/../ipv6_address.h:
+
 ../include/dot11/../small_uint.h:
 
 ../include/dot11/../hw_address.h:
@@ -3260,9 +3949,10 @@ src/hwaddress.o: src/hwaddress.cpp ../include/hw_address.h \
 ../include/cxxstd.h:
 src/icmp.o: src/icmp.cpp ../include/icmp.h ../include/macros.h \
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
- ../include/endianness.h ../include/utils.h ../include/ip_address.h \
- ../include/ipv6_address.h ../include/hw_address.h ../include/internals.h \
- ../include/constants.h
+ ../include/endianness.h ../include/ip_address.h ../include/ip.h \
+ ../include/small_uint.h ../include/pdu_option.h ../include/internals.h \
+ ../include/constants.h ../include/hw_address.h ../include/ipv6_address.h \
+ ../include/ethernetII.h ../include/utils.h
 
 ../include/icmp.h:
 
@@ -3276,23 +3966,31 @@ src/icmp.o: src/icmp.cpp ../include/icmp.h ../include/macros.h \
 
 ../include/endianness.h:
 
-../include/utils.h:
-
 ../include/ip_address.h:
 
-../include/ipv6_address.h:
+../include/ip.h:
 
-../include/hw_address.h:
+../include/small_uint.h:
+
+../include/pdu_option.h:
 
 ../include/internals.h:
 
 ../include/constants.h:
+
+../include/hw_address.h:
+
+../include/ipv6_address.h:
+
+../include/ethernetII.h:
+
+../include/utils.h:
 src/icmpv6.o: src/icmpv6.cpp ../include/icmpv6.h ../include/macros.h \
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/ipv6_address.h ../include/pdu_option.h \
- ../include/endianness.h ../include/small_uint.h ../include/hw_address.h \
- ../include/ip.h ../include/ip_address.h ../include/tcp.h \
- ../include/utils.h ../include/internals.h ../include/constants.h \
+ ../include/endianness.h ../include/internals.h ../include/constants.h \
+ ../include/hw_address.h ../include/ip_address.h ../include/small_uint.h \
+ ../include/ip.h ../include/tcp.h ../include/utils.h \
  ../include/hw_address.h
 
 ../include/icmpv6.h:
@@ -3311,29 +4009,30 @@ src/icmpv6.o: src/icmpv6.cpp ../include/icmpv6.h ../include/macros.h \
 
 ../include/endianness.h:
 
-../include/small_uint.h:
-
-../include/hw_address.h:
-
-../include/ip.h:
-
-../include/ip_address.h:
-
-../include/tcp.h:
-
-../include/utils.h:
-
 ../include/internals.h:
 
 ../include/constants.h:
 
+../include/hw_address.h:
+
+../include/ip_address.h:
+
+../include/small_uint.h:
+
+../include/ip.h:
+
+../include/tcp.h:
+
+../include/utils.h:
+
 ../include/hw_address.h:
 src/ip.o: src/ip.cpp ../include/ip.h ../include/pdu.h ../include/macros.h \
  ../include/cxxstd.h ../include/exceptions.h ../include/small_uint.h \
  ../include/endianness.h ../include/ip_address.h ../include/pdu_option.h \
- ../include/tcp.h ../include/udp.h ../include/icmp.h \
- ../include/ip_address.h ../include/utils.h ../include/ipv6_address.h \
- ../include/hw_address.h ../include/internals.h ../include/constants.h
+ ../include/internals.h ../include/constants.h ../include/hw_address.h \
+ ../include/ipv6_address.h ../include/tcp.h ../include/udp.h \
+ ../include/icmp.h ../include/ip_address.h ../include/utils.h \
+ ../include/ethernetII.h
 
 ../include/ip.h:
 
@@ -3353,6 +4052,14 @@ src/ip.o: src/ip.cpp ../include/ip.h ../include/pdu.h ../include/macros.h \
 
 ../include/pdu_option.h:
 
+../include/internals.h:
+
+../include/constants.h:
+
+../include/hw_address.h:
+
+../include/ipv6_address.h:
+
 ../include/tcp.h:
 
 ../include/udp.h:
@@ -3363,17 +4070,12 @@ src/ip.o: src/ip.cpp ../include/ip.h ../include/pdu.h ../include/macros.h \
 
 ../include/utils.h:
 
-../include/ipv6_address.h:
-
-../include/hw_address.h:
-
-../include/internals.h:
-
-../include/constants.h:
+../include/ethernetII.h:
 src/ip_reassembler.o: src/ip_reassembler.cpp ../include/ip_reassembler.h \
  ../include/pdu.h ../include/macros.h ../include/cxxstd.h \
- ../include/exceptions.h ../include/ethernetII.h ../include/endianness.h \
- ../include/hw_address.h ../include/udp.h ../include/rawpdu.h
+ ../include/exceptions.h ../include/ip_address.h ../include/ethernetII.h \
+ ../include/endianness.h ../include/hw_address.h ../include/udp.h \
+ ../include/rawpdu.h
 
 ../include/ip_reassembler.h:
 
@@ -3385,6 +4087,8 @@ src/ip_reassembler.o: src/ip_reassembler.cpp ../include/ip_reassembler.h \
 
 ../include/exceptions.h:
 
+../include/ip_address.h:
+
 ../include/ethernetII.h:
 
 ../include/endianness.h:
@@ -3448,10 +4152,10 @@ src/ipsec.o: src/ipsec.cpp ../include/ipsec.h ../include/pdu.h \
 src/ipv6.o: src/ipv6.cpp ../include/ipv6.h ../include/macros.h \
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/small_uint.h ../include/pdu_option.h \
- ../include/ipv6_address.h ../include/tcp.h ../include/udp.h \
- ../include/icmp.h ../include/icmpv6.h ../include/hw_address.h \
- ../include/ipv6_address.h ../include/utils.h ../include/ip_address.h \
- ../include/internals.h ../include/constants.h
+ ../include/internals.h ../include/constants.h ../include/hw_address.h \
+ ../include/ip_address.h ../include/ipv6_address.h ../include/tcp.h \
+ ../include/udp.h ../include/icmp.h ../include/icmpv6.h \
+ ../include/ipv6_address.h ../include/utils.h
 
 ../include/ipv6.h:
 
@@ -3469,6 +4173,14 @@ src/ipv6.o: src/ipv6.cpp ../include/ipv6.h ../include/macros.h \
 
 ../include/pdu_option.h:
 
+../include/internals.h:
+
+../include/constants.h:
+
+../include/hw_address.h:
+
+../include/ip_address.h:
+
 ../include/ipv6_address.h:
 
 ../include/tcp.h:
@@ -3479,17 +4191,9 @@ src/ipv6.o: src/ipv6.cpp ../include/ipv6.h ../include/macros.h \
 
 ../include/icmpv6.h:
 
-../include/hw_address.h:
-
 ../include/ipv6_address.h:
 
 ../include/utils.h:
-
-../include/ip_address.h:
-
-../include/internals.h:
-
-../include/constants.h:
 src/ipv6address.o: src/ipv6address.cpp ../include/ipv6_address.h \
  ../include/cxxstd.h ../include/utils.h ../include/macros.h \
  ../include/ip_address.h ../include/ipv6_address.h \
@@ -3538,7 +4242,8 @@ src/matches_response.o: src/matches_response.cpp ../include/ethernetII.h \
  ../include/exceptions.h ../include/endianness.h ../include/hw_address.h \
  ../include/rawpdu.h ../include/udp.h ../include/dhcp.h \
  ../include/bootp.h ../include/ip_address.h ../include/pdu_option.h \
- ../include/dhcpv6.h ../include/small_uint.h ../include/ipv6_address.h
+ ../include/internals.h ../include/constants.h ../include/ipv6_address.h \
+ ../include/dhcpv6.h ../include/small_uint.h ../include/ip.h
 
 ../include/ethernetII.h:
 
@@ -3566,11 +4271,17 @@ src/matches_response.o: src/matches_response.cpp ../include/ethernetII.h \
 
 ../include/pdu_option.h:
 
+../include/internals.h:
+
+../include/constants.h:
+
+../include/ipv6_address.h:
+
 ../include/dhcpv6.h:
 
 ../include/small_uint.h:
 
-../include/ipv6_address.h:
+../include/ip.h:
 src/network_interface.o: src/network_interface.cpp \
  ../include/network_interface.h ../include/hw_address.h \
  ../include/cxxstd.h ../include/ip_address.h ../include/utils.h \
@@ -3604,9 +4315,10 @@ src/network_interface.o: src/network_interface.cpp \
 src/pdu.o: src/pdu.cpp ../include/ip.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/small_uint.h ../include/endianness.h ../include/ip_address.h \
- ../include/pdu_option.h ../include/tcp.h ../include/udp.h \
- ../include/rawpdu.h ../include/pdu.h ../include/packet.h \
- ../include/timestamp.h
+ ../include/pdu_option.h ../include/internals.h ../include/constants.h \
+ ../include/hw_address.h ../include/ipv6_address.h ../include/tcp.h \
+ ../include/udp.h ../include/rawpdu.h ../include/pdu.h \
+ ../include/packet.h ../include/timestamp.h
 
 ../include/ip.h:
 
@@ -3626,6 +4338,14 @@ src/pdu.o: src/pdu.cpp ../include/ip.h ../include/pdu.h \
 
 ../include/pdu_option.h:
 
+../include/internals.h:
+
+../include/constants.h:
+
+../include/hw_address.h:
+
+../include/ipv6_address.h:
+
 ../include/tcp.h:
 
 ../include/udp.h:
@@ -3644,6 +4364,13 @@ src/ppi.o: src/ppi.cpp ../include/dot11/dot11_data.h \
  ../include/dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../exceptions.h \
  ../include/dot11/../dot11/../pdu_option.h \
+ ../include/dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../pdu.h \
+ ../include/dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../endianness.h \
@@ -3670,6 +4397,20 @@ src/ppi.o: src/ppi.cpp ../include/dot11/dot11_data.h \
 
 ../include/dot11/../dot11/../pdu_option.h:
 
+../include/dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../pdu.h:
+
+../include/dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../hw_address.h:
@@ -3694,7 +4435,9 @@ src/ppi.o: src/ppi.cpp ../include/dot11/dot11_data.h \
 src/pppoe.o: src/pppoe.cpp ../include/pppoe.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/small_uint.h ../include/pdu_option.h \
- ../include/ethernetII.h ../include/hw_address.h
+ ../include/internals.h ../include/constants.h ../include/hw_address.h \
+ ../include/ip_address.h ../include/ipv6_address.h \
+ ../include/ethernetII.h
 
 ../include/pppoe.h:
 
@@ -3712,9 +4455,17 @@ src/pppoe.o: src/pppoe.cpp ../include/pppoe.h ../include/pdu.h \
 
 ../include/pdu_option.h:
 
-../include/ethernetII.h:
+../include/internals.h:
+
+../include/constants.h:
 
 ../include/hw_address.h:
+
+../include/ip_address.h:
+
+../include/ipv6_address.h:
+
+../include/ethernetII.h:
 src/radiotap.o: src/radiotap.cpp ../include/radiotap.h \
  ../include/config.h ../include/macros.h ../include/pdu.h \
  ../include/cxxstd.h ../include/exceptions.h ../include/endianness.h \
@@ -3723,9 +4474,16 @@ src/radiotap.o: src/radiotap.cpp ../include/radiotap.h \
  ../include/dot11/../dot11/../config.h ../include/dot11/../dot11/../pdu.h \
  ../include/dot11/../dot11/../pdu_option.h \
  ../include/dot11/../dot11/../exceptions.h \
- ../include/dot11/../dot11/../small_uint.h \
+ ../include/dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../constants.h \
+ ../include/dot11/../dot11/../pdu.h \
  ../include/dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../cxxstd.h \
+ ../include/dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../ipv6_address.h \
+ ../include/dot11/../dot11/../small_uint.h \
+ ../include/dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../endianness.h \
  ../include/dot11/../dot11/../cxxstd.h \
  ../include/dot11/../dot11/../macros.h ../include/dot11/dot11_beacon.h \
@@ -3733,7 +4491,7 @@ src/radiotap.o: src/radiotap.cpp ../include/radiotap.h \
  ../include/dot11/../dot11/../dot11/dot11_base.h \
  ../include/dot11/../dot11/../dot11/../config.h ../include/utils.h \
  ../include/ip_address.h ../include/ipv6_address.h \
- ../include/hw_address.h ../include/internals.h ../include/constants.h
+ ../include/hw_address.h ../include/internals.h
 
 ../include/radiotap.h:
 
@@ -3763,12 +4521,26 @@ src/radiotap.o: src/radiotap.cpp ../include/radiotap.h \
 
 ../include/dot11/../dot11/../exceptions.h:
 
-../include/dot11/../dot11/../small_uint.h:
+../include/dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../constants.h:
+
+../include/dot11/../dot11/../pdu.h:
 
 ../include/dot11/../dot11/../hw_address.h:
 
 ../include/dot11/../dot11/../cxxstd.h:
 
+../include/dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../ipv6_address.h:
+
+../include/dot11/../dot11/../small_uint.h:
+
+../include/dot11/../dot11/../hw_address.h:
+
 ../include/dot11/../dot11/../endianness.h:
 
 ../include/dot11/../dot11/../cxxstd.h:
@@ -3792,8 +4564,6 @@ src/radiotap.o: src/radiotap.cpp ../include/radiotap.h \
 ../include/hw_address.h:
 
 ../include/internals.h:
-
-../include/constants.h:
 src/rc4eapol.o: src/rc4eapol.cpp ../include/eapol.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/small_uint.h ../include/endianness.h ../include/utils.h \
@@ -3863,7 +4633,8 @@ src/sll.o: src/sll.cpp ../include/sll.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/hw_address.h ../include/hw_address.h \
  ../include/constants.h ../include/ip.h ../include/small_uint.h \
- ../include/ip_address.h ../include/pdu_option.h
+ ../include/ip_address.h ../include/pdu_option.h ../include/internals.h \
+ ../include/constants.h ../include/ipv6_address.h
 
 ../include/sll.h:
 
@@ -3890,6 +4661,12 @@ src/sll.o: src/sll.cpp ../include/sll.h ../include/pdu.h \
 ../include/ip_address.h:
 
 ../include/pdu_option.h:
+
+../include/internals.h:
+
+../include/constants.h:
+
+../include/ipv6_address.h:
 src/snap.o: src/snap.cpp ../include/snap.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/small_uint.h ../include/utils.h \
@@ -3948,9 +4725,9 @@ src/stp.o: src/stp.cpp ../include/stp.h ../include/pdu.h \
 src/tcp.o: src/tcp.cpp ../include/tcp.h ../include/pdu.h \
  ../include/macros.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/small_uint.h ../include/pdu_option.h \
- ../include/ip.h ../include/ip_address.h ../include/utils.h \
- ../include/ipv6_address.h ../include/hw_address.h ../include/internals.h \
- ../include/constants.h
+ ../include/internals.h ../include/constants.h ../include/hw_address.h \
+ ../include/ip_address.h ../include/ipv6_address.h ../include/ip.h \
+ ../include/utils.h
 
 ../include/tcp.h:
 
@@ -3968,26 +4745,26 @@ src/tcp.o: src/tcp.cpp ../include/tcp.h ../include/pdu.h \
 
 ../include/pdu_option.h:
 
-../include/ip.h:
-
-../include/ip_address.h:
-
-../include/utils.h:
-
-../include/ipv6_address.h:
-
-../include/hw_address.h:
-
 ../include/internals.h:
 
 ../include/constants.h:
+
+../include/hw_address.h:
+
+../include/ip_address.h:
+
+../include/ipv6_address.h:
+
+../include/ip.h:
+
+../include/utils.h:
 src/tcp_stream.o: src/tcp_stream.cpp ../include/tcp_stream.h \
  ../include/sniffer.h ../include/pdu.h ../include/macros.h \
  ../include/cxxstd.h ../include/exceptions.h ../include/packet.h \
  ../include/timestamp.h ../include/internals.h ../include/constants.h \
  ../include/hw_address.h ../include/tcp.h ../include/endianness.h \
- ../include/small_uint.h ../include/pdu_option.h ../include/utils.h \
- ../include/ip_address.h ../include/ipv6_address.h ../include/ip.h \
+ ../include/small_uint.h ../include/pdu_option.h ../include/ip_address.h \
+ ../include/ipv6_address.h ../include/utils.h ../include/ip.h \
  ../include/tcp.h ../include/ethernetII.h ../include/utils.h
 
 ../include/tcp_stream.h:
@@ -4020,12 +4797,12 @@ src/tcp_stream.o: src/tcp_stream.cpp ../include/tcp_stream.h \
 
 ../include/pdu_option.h:
 
-../include/utils.h:
-
 ../include/ip_address.h:
 
 ../include/ipv6_address.h:
 
+../include/utils.h:
+
 ../include/ip.h:
 
 ../include/tcp.h:
@@ -4036,7 +4813,8 @@ src/tcp_stream.o: src/tcp_stream.cpp ../include/tcp_stream.h \
 src/udp.o: src/udp.cpp ../include/udp.h ../include/macros.h \
  ../include/pdu.h ../include/cxxstd.h ../include/exceptions.h \
  ../include/endianness.h ../include/ip.h ../include/small_uint.h \
- ../include/ip_address.h ../include/pdu_option.h
+ ../include/ip_address.h ../include/pdu_option.h ../include/internals.h \
+ ../include/constants.h ../include/hw_address.h ../include/ipv6_address.h
 
 ../include/udp.h:
 
@@ -4057,6 +4835,14 @@ src/udp.o: src/udp.cpp ../include/udp.h ../include/macros.h \
 ../include/ip_address.h:
 
 ../include/pdu_option.h:
+
+../include/internals.h:
+
+../include/constants.h:
+
+../include/hw_address.h:
+
+../include/ipv6_address.h:
 src/utils.o: src/utils.cpp ../include/utils.h ../include/macros.h \
  ../include/ip_address.h ../include/cxxstd.h ../include/ipv6_address.h \
  ../include/hw_address.h ../include/internals.h ../include/constants.h \
@@ -4100,6 +4886,11 @@ src/wep_decrypt.o: src/wep_decrypt.cpp ../include/config.h \
  ../include/dot11/../dot11/../config.h ../include/dot11/../dot11/../pdu.h \
  ../include/dot11/../dot11/../pdu_option.h \
  ../include/dot11/../dot11/../exceptions.h \
+ ../include/dot11/../dot11/../endianness.h \
+ ../include/dot11/../dot11/../internals.h \
+ ../include/dot11/../dot11/../ip_address.h \
+ ../include/dot11/../dot11/../hw_address.h \
+ ../include/dot11/../dot11/../ipv6_address.h \
  ../include/dot11/../dot11/../small_uint.h \
  ../include/dot11/../dot11/../hw_address.h \
  ../include/dot11/../dot11/../endianness.h \
@@ -4160,6 +4951,16 @@ src/wep_decrypt.o: src/wep_decrypt.cpp ../include/config.h \
 
 ../include/dot11/../dot11/../exceptions.h:
 
+../include/dot11/../dot11/../endianness.h:
+
+../include/dot11/../dot11/../internals.h:
+
+../include/dot11/../dot11/../ip_address.h:
+
+../include/dot11/../dot11/../hw_address.h:
+
+../include/dot11/../dot11/../ipv6_address.h:
+
 ../include/dot11/../dot11/../small_uint.h:
 
 ../include/dot11/../dot11/../hw_address.h:
diff --git a/tests/src/icmpv6.cpp b/tests/src/icmpv6.cpp
index 37b3824..0c16d8b 100644
--- a/tests/src/icmpv6.cpp
+++ b/tests/src/icmpv6.cpp
@@ -281,8 +281,9 @@ TEST_F(ICMPv6Test, RSASignature) {
 
 TEST_F(ICMPv6Test, Timestamp) {
     ICMPv6 icmp;
-    icmp.timestamp(0x2837d6aaa231ULL);
-    EXPECT_EQ(icmp.timestamp(), 0x2837d6aaa231ULL);
+    ICMPv6::timestamp_type ts(0x2837d6aaa231ULL);
+    icmp.timestamp(ts);
+    EXPECT_EQ(ts.timestamp, icmp.timestamp().timestamp);
 }
 
 TEST_F(ICMPv6Test, Nonce) {