diff --git a/include/tins/dhcp.h b/include/tins/dhcp.h
index 7fe33d1..d0dc07d 100644
--- a/include/tins/dhcp.h
+++ b/include/tins/dhcp.h
@@ -30,7 +30,6 @@
 #ifndef TINS_DHCP_H
 #define TINS_DHCP_H
 
-#include <list>
 #include <vector>
 #include <string>
 #include "bootp.h"
@@ -170,7 +169,7 @@ public:
     /**
      * The type used to store the DHCP options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
     
     /**
      * \brief Extracts metadata for this protocol based on the buffer provided
@@ -436,8 +435,7 @@ public:
      * If the option is not found, an option_not_found exception
      * is thrown.
      * 
-     * \return std::list<ipaddress_type> Contanining the DNS servers
-     * provided.
+     * \return The list of DNS servers provided.
      */
     std::vector<ipaddress_type> domain_name_servers() const; 
     
diff --git a/include/tins/dhcpv6.h b/include/tins/dhcpv6.h
index af010ac..8433fc4 100644
--- a/include/tins/dhcpv6.h
+++ b/include/tins/dhcpv6.h
@@ -31,7 +31,6 @@
 #define TINS_DHCPV6_H
 
 #include <cstring>
-#include <list>
 #include "pdu.h"
 #include "macros.h"
 #include "endianness.h"
@@ -163,7 +162,7 @@ public:
     /**
      * The type used to store the DHCPv6 options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
 
     /**
      * The type used to store IP addresses.
diff --git a/include/tins/dns.h b/include/tins/dns.h
index 0ce1314..fa12cd4 100644
--- a/include/tins/dns.h
+++ b/include/tins/dns.h
@@ -31,7 +31,6 @@
 #define TINS_DNS_H
 
 #include <stdint.h>
-#include <list>
 #include <vector>
 #include <cstring>
 #include <string>
@@ -602,8 +601,8 @@ public:
     TINS_DEPRECATED(typedef query Query);
     TINS_DEPRECATED(typedef resource Resource);
     
-    typedef std::list<query> queries_type;
-    typedef std::list<resource> resources_type;
+    typedef std::vector<query> queries_type;
+    typedef std::vector<resource> resources_type;
     typedef IPv4Address address_type;
     typedef IPv6Address address_v6_type;
     
diff --git a/include/tins/dot11/dot11_base.h b/include/tins/dot11/dot11_base.h
index 3f0fba4..760d5e5 100644
--- a/include/tins/dot11/dot11_base.h
+++ b/include/tins/dot11/dot11_base.h
@@ -32,7 +32,6 @@
 #if !defined(TINS_DOT11_DOT11_H) && defined(TINS_HAVE_DOT11)
 #define TINS_DOT11_DOT11_H
 
-#include <list>
 #include "../pdu.h"
 #include "../pdu_option.h"
 #include "../small_uint.h"
@@ -67,7 +66,7 @@ public:
     /**
      * The type used to store tagged options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
 
     /**
      * \brief This PDU's flag.
diff --git a/include/tins/icmp_extension.h b/include/tins/icmp_extension.h
index 99ade0a..63327aa 100644
--- a/include/tins/icmp_extension.h
+++ b/include/tins/icmp_extension.h
@@ -31,7 +31,6 @@
 #define TINS_ICMP_EXTENSION_H
 
 #include <vector>
-#include <list>
 #include <stdint.h>
 #include "macros.h"
 #include "small_uint.h"
@@ -176,7 +175,7 @@ public:
     /**
      * The type used to store the list of ICMP extensions in this structure
      */
-    typedef std::list<ICMPExtension> extensions_type;
+    typedef std::vector<ICMPExtension> extensions_type;
 
     /**
      * \brief Default constructor
diff --git a/include/tins/icmpv6.h b/include/tins/icmpv6.h
index c1b58d1..040eeb7 100644
--- a/include/tins/icmpv6.h
+++ b/include/tins/icmpv6.h
@@ -30,7 +30,6 @@
 #ifndef TINS_ICMPV6_H
 #define TINS_ICMPV6_H
 
-#include <list>
 #include <vector>
 #include "macros.h"
 #include "pdu.h"
@@ -155,7 +154,7 @@ public:
     /**
      * The type used to store options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
     
     /**
      * \brief The type used to store the new home agent information 
@@ -548,13 +547,13 @@ public:
     /*
      * The type used to store all multicast address records in a packet
      */
-    typedef std::list<multicast_address_record> multicast_address_records_list;
+    typedef std::vector<multicast_address_record> multicast_address_records_list;
 
     /*
      * The type used to store all source address (from Multicast 
      * Listener Query messages) in a packet 
      */
-    typedef std::list<ipaddress_type> sources_list;
+    typedef std::vector<ipaddress_type> sources_list;
 
     /**
      * \brief Constructs an ICMPv6 object.
diff --git a/include/tins/ip.h b/include/tins/ip.h
index 420f974..236882c 100644
--- a/include/tins/ip.h
+++ b/include/tins/ip.h
@@ -30,7 +30,6 @@
 #ifndef TINS_IP_H
 #define TINS_IP_H
 
-#include <list>
 #include "pdu.h"
 #include "small_uint.h"
 #include "endianness.h"
@@ -244,7 +243,7 @@ public:
     /**
      * The type used to store IP options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
 
     /**
      * \brief Extracts metadata for this protocol based on the buffer provided
diff --git a/include/tins/ipv6.h b/include/tins/ipv6.h
index 95d3e30..013581d 100644
--- a/include/tins/ipv6.h
+++ b/include/tins/ipv6.h
@@ -30,7 +30,6 @@
 #ifndef TINS_IPV6_h
 #define TINS_IPV6_h
 
-#include <list>
 #include "macros.h"
 #include "pdu.h"
 #include "endianness.h"
@@ -71,7 +70,7 @@ public:
     /**
      * The type used to store the extension headers.
      */
-    typedef std::list<ext_header> headers_type;
+    typedef std::vector<ext_header> headers_type;
 
     /**
      * The values used to identify extension headers.
diff --git a/include/tins/llc.h b/include/tins/llc.h
index 4b2ae33..2f67c31 100644
--- a/include/tins/llc.h
+++ b/include/tins/llc.h
@@ -30,7 +30,6 @@
 #ifndef TINS_IEEE8022_H
 #define TINS_IEEE8022_H
 
-#include <list>
 #include <vector>
 #include <stdint.h>
 #include "macros.h"
@@ -399,7 +398,7 @@ private:
     #endif
     
     typedef std::vector<uint8_t> field_type;
-    typedef std::list<field_type> field_list;
+    typedef std::vector<field_type> field_list;
 
     void write_serialization(uint8_t* buffer, uint32_t total_sz);
 
diff --git a/include/tins/pppoe.h b/include/tins/pppoe.h
index 40b1b80..77abfd4 100644
--- a/include/tins/pppoe.h
+++ b/include/tins/pppoe.h
@@ -30,7 +30,6 @@
 #ifndef TINS_PPPoE_H
 #define TINS_PPPoE_H
 
-#include <list>
 #include <string>
 #include <vector>
 #include "pdu.h"
@@ -82,7 +81,7 @@ public:
     /**
      * The type used to store the options.
      */
-    typedef std::list<tag> tags_type;
+    typedef std::vector<tag> tags_type;
     
     /**
      * The type used to store the Vendor-Specific tag's value.
diff --git a/include/tins/tcp.h b/include/tins/tcp.h
index 4f762d6..8794ca7 100644
--- a/include/tins/tcp.h
+++ b/include/tins/tcp.h
@@ -30,8 +30,6 @@
 #ifndef TINS_TCP_H
 #define TINS_TCP_H
 
-
-#include <list>
 #include <vector>
 #include <stdint.h>
 #include <utility>
@@ -131,7 +129,7 @@ public:
     /**
      * The type used to store the options.
      */
-    typedef std::list<option> options_type;
+    typedef std::vector<option> options_type;
     
     /**
      * The type used to store the sack option.
diff --git a/src/dhcp.cpp b/src/dhcp.cpp
index 142f4a7..7d70436 100644
--- a/src/dhcp.cpp
+++ b/src/dhcp.cpp
@@ -35,7 +35,6 @@
 
 using std::string;
 using std::vector;
-using std::list;
 using std::runtime_error;
 
 using Tins::Memory::InputMemoryStream;
diff --git a/src/dns.cpp b/src/dns.cpp
index f700ef2..046fec1 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -38,7 +38,6 @@
 
 using std::string;
 using std::memcpy;
-using std::list;
 using std::make_pair;
 
 using Tins::Memory::InputMemoryStream;
diff --git a/src/dot11/dot11_base.cpp b/src/dot11/dot11_base.cpp
index b884bc6..5ab1a77 100644
--- a/src/dot11/dot11_base.cpp
+++ b/src/dot11/dot11_base.cpp
@@ -49,7 +49,7 @@
 #include "packet_sender.h"
 #include "memory_helpers.h"
 
-using std::list;
+using std::vector;
 
 using Tins::Memory::InputMemoryStream;
 using Tins::Memory::OutputMemoryStream;
@@ -212,7 +212,7 @@ void Dot11::write_serialization(uint8_t* buffer, uint32_t total_sz) {
     stream.write(header_);
     write_ext_header(stream);
     write_fixed_parameters(stream);
-    for (list<option>::const_iterator it = options_.begin(); it != options_.end(); ++it) {
+    for (vector<option>::const_iterator it = options_.begin(); it != options_.end(); ++it) {
         stream.write<uint8_t>(it->option());
         stream.write<uint8_t>(it->length_field());
         stream.write(it->data_ptr(), it->data_size());
diff --git a/src/ip.cpp b/src/ip.cpp
index b970eb5..ec4bd94 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -47,7 +47,6 @@
 #include "detail/pdu_helpers.h"
 #include "pdu_allocator.h"
 
-using std::list;
 using std::memcmp;
 using std::vector;
 
diff --git a/tests/src/dns_test.cpp b/tests/src/dns_test.cpp
index 55641a4..c4d9dab 100644
--- a/tests/src/dns_test.cpp
+++ b/tests/src/dns_test.cpp
@@ -91,11 +91,11 @@ TEST_F(DNSTest, ConstructorFromBuffer) {
     EXPECT_EQ(dns.questions_count(), 1);
     EXPECT_EQ(dns.answers_count(), 1);
     
-    std::list<DNS::query> queries = dns.queries();
+    std::vector<DNS::query> queries = dns.queries();
     ASSERT_EQ(queries.size(), 1U);
     test_equals(queries.front(), DNS::query("www.example.com", DNS::A, DNS::INTERNET));
     
-    std::list<DNS::resource> answers = dns.answers();
+    std::vector<DNS::resource> answers = dns.answers();
     ASSERT_EQ(answers.size(), 1U);
     test_equals(answers.front(), DNS::resource("www.example.com", "192.168.0.1", DNS::A,
                                                DNS::INTERNET, 0x1234));