diff --git a/include/tins/arp.h b/include/tins/arp.h
index af1c8cd..9ed65a4 100644
--- a/include/tins/arp.h
+++ b/include/tins/arp.h
@@ -298,7 +298,7 @@ public:
                                      const hwaddress_type& hw_snd = hwaddress_type());
 
     /** 
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/bootp.h b/include/tins/bootp.h
index 97c021b..c6e9294 100644
--- a/include/tins/bootp.h
+++ b/include/tins/bootp.h
@@ -299,7 +299,7 @@ public:
     void vend(const vend_type& newvend_);
 
     /**
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * This returns true if the xid field is equal.
      * 
diff --git a/include/tins/dhcpv6.h b/include/tins/dhcpv6.h
index ff32957..0156b1b 100644
--- a/include/tins/dhcpv6.h
+++ b/include/tins/dhcpv6.h
@@ -859,7 +859,7 @@ public:
     uint32_t header_size() const;
     
         /** 
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/dns.h b/include/tins/dns.h
index 742d7c3..0d23d56 100644
--- a/include/tins/dns.h
+++ b/include/tins/dns.h
@@ -939,7 +939,7 @@ public:
     static std::string decode_domain_name(const std::string& domain_name);
 
     /** 
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/dot11/dot11_assoc.h b/include/tins/dot11/dot11_assoc.h
index 13500e0..f6ae465 100644
--- a/include/tins/dot11/dot11_assoc.h
+++ b/include/tins/dot11/dot11_assoc.h
@@ -108,7 +108,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -226,7 +226,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -361,7 +361,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -497,7 +497,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -633,7 +633,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
diff --git a/include/tins/dot11/dot11_auth.h b/include/tins/dot11/dot11_auth.h
index b949fc5..b71346a 100644
--- a/include/tins/dot11/dot11_auth.h
+++ b/include/tins/dot11/dot11_auth.h
@@ -140,7 +140,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -240,7 +240,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
diff --git a/include/tins/dot11/dot11_base.h b/include/tins/dot11/dot11_base.h
index f51568d..dd33a4e 100644
--- a/include/tins/dot11/dot11_base.h
+++ b/include/tins/dot11/dot11_base.h
@@ -475,7 +475,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
diff --git a/include/tins/dot11/dot11_beacon.h b/include/tins/dot11/dot11_beacon.h
index 224e303..c4ca35f 100644
--- a/include/tins/dot11/dot11_beacon.h
+++ b/include/tins/dot11/dot11_beacon.h
@@ -137,7 +137,7 @@ public:
     uint32_t header_size() const;
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
diff --git a/include/tins/dot11/dot11_control.h b/include/tins/dot11/dot11_control.h
index 1648de9..4305d71 100644
--- a/include/tins/dot11/dot11_control.h
+++ b/include/tins/dot11/dot11_control.h
@@ -82,7 +82,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -214,7 +214,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -276,7 +276,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -338,7 +338,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -400,7 +400,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -460,7 +460,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -591,7 +591,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -740,7 +740,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
diff --git a/include/tins/dot11/dot11_data.h b/include/tins/dot11/dot11_data.h
index 7156dfa..1a4cd55 100644
--- a/include/tins/dot11/dot11_data.h
+++ b/include/tins/dot11/dot11_data.h
@@ -234,7 +234,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -345,7 +345,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
diff --git a/include/tins/dot11/dot11_mgmt.h b/include/tins/dot11/dot11_mgmt.h
index b566cd2..09ceeae 100644
--- a/include/tins/dot11/dot11_mgmt.h
+++ b/include/tins/dot11/dot11_mgmt.h
@@ -1212,7 +1212,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
diff --git a/include/tins/dot11/dot11_probe.h b/include/tins/dot11/dot11_probe.h
index 7574704..3fe2133 100644
--- a/include/tins/dot11/dot11_probe.h
+++ b/include/tins/dot11/dot11_probe.h
@@ -85,7 +85,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -219,7 +219,7 @@ public:
     PDUType pdu_type() const { return pdu_flag; }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
diff --git a/include/tins/dot1q.h b/include/tins/dot1q.h
index 072fb59..9a4b04e 100644
--- a/include/tins/dot1q.h
+++ b/include/tins/dot1q.h
@@ -181,7 +181,7 @@ public:
     void append_padding(bool value);
     
     /** 
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/dot3.h b/include/tins/dot3.h
index 2f4429d..2c46a22 100644
--- a/include/tins/dot3.h
+++ b/include/tins/dot3.h
@@ -153,7 +153,7 @@ public:
     #endif // !_WIN32 || HAVE_PACKET_SENDER_PCAP_SENDPACKET
 
     /** 
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/eapol.h b/include/tins/eapol.h
index f506a6f..09b3ec6 100644
--- a/include/tins/eapol.h
+++ b/include/tins/eapol.h
@@ -354,7 +354,7 @@ public:
     }
     
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
@@ -755,7 +755,7 @@ public:
     }
     
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      * \param flag The flag to match
      * \sa PDU::matches_flag
      */
diff --git a/include/tins/ethernetII.h b/include/tins/ethernetII.h
index 292bfb9..e66b0ec 100644
--- a/include/tins/ethernetII.h
+++ b/include/tins/ethernetII.h
@@ -158,7 +158,7 @@ public:
     void send(PacketSender& sender, const NetworkInterface& iface);
 
     /** 
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/icmp.h b/include/tins/icmp.h
index b2fdbeb..1e847b6 100644
--- a/include/tins/icmp.h
+++ b/include/tins/icmp.h
@@ -238,7 +238,7 @@ public:
     /**
      * \brief Sets parameter problem flag for this PDU.
      *
-     * \param set_pointer Indicates wether a pointer to the bad octet
+     * \param set_pointer Indicates whether a pointer to the bad octet
      * is provided.
      * \param bad_octet Identifies the octet in which the error was
      * detected. If set_pointer == false, it is ignored.
@@ -396,7 +396,7 @@ public:
     uint32_t trailer_size() const;
 
     /**
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/icmpv6.h b/include/tins/icmpv6.h
index 7e6fd1e..228bd83 100644
--- a/include/tins/icmpv6.h
+++ b/include/tins/icmpv6.h
@@ -1084,7 +1084,7 @@ public:
     void use_length_field(bool value);
 
     /** 
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/ip.h b/include/tins/ip.h
index 371ea4f..a552836 100644
--- a/include/tins/ip.h
+++ b/include/tins/ip.h
@@ -685,7 +685,7 @@ public:
     void send(PacketSender& sender, const NetworkInterface &);
 
     /**
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/ipv6.h b/include/tins/ipv6.h
index 70c59c3..0b0f374 100644
--- a/include/tins/ipv6.h
+++ b/include/tins/ipv6.h
@@ -256,7 +256,7 @@ public:
     uint32_t header_size() const;
     
     /** 
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/loopback.h b/include/tins/loopback.h
index fd9c8cd..f242486 100644
--- a/include/tins/loopback.h
+++ b/include/tins/loopback.h
@@ -95,7 +95,7 @@ public:
     }
     
     /** 
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/pdu.h b/include/tins/pdu.h
index dbfcbe4..ecd6ca1 100644
--- a/include/tins/pdu.h
+++ b/include/tins/pdu.h
@@ -393,9 +393,9 @@ public:
     virtual PDU* recv_response(PacketSender& sender, const NetworkInterface& iface);
 
     /** 
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
-     * This method must check wether the buffer pointed by ptr is a valid
+     * This method must check whether the buffer pointed by ptr is a valid
      * response for this PDU. If it is valid, then it might want to propagate
      * the call to the next PDU. Note that in some cases, such as ICMP
      * Host Unreachable, there is no need to ask the next layer for matching.
@@ -407,7 +407,7 @@ public:
     }
 
     /**
-     * \brief Check wether this PDU matches the specified flag.
+     * \brief Check whether this PDU matches the specified flag.
      *
      * This method should be reimplemented in PDU classes which have
      * subclasses, and try to match the given PDU to each of its parent
diff --git a/include/tins/radiotap.h b/include/tins/radiotap.h
index ce38b8b..9715d2b 100644
--- a/include/tins/radiotap.h
+++ b/include/tins/radiotap.h
@@ -369,7 +369,7 @@ public:
         return (PresentFlags)Endian::le_to_host(radio_.flags_32);
     }
     
-    /** \brief Check wether ptr points to a valid response for this PDU.
+    /** \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/rawpdu.h b/include/tins/rawpdu.h
index 85566a8..b98985b 100644
--- a/include/tins/rawpdu.h
+++ b/include/tins/rawpdu.h
@@ -166,7 +166,7 @@ public:
     }
 
     /**
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * This always returns true, since we don't know what this 
      * RawPDU is holding.
diff --git a/include/tins/sniffer.h b/include/tins/sniffer.h
index 1d6b4d7..4e21fde 100644
--- a/include/tins/sniffer.h
+++ b/include/tins/sniffer.h
@@ -315,7 +315,7 @@ public:
      * constructor.
      * \param device The device which will be sniffed.
      * \param max_packet_size The maximum packet size to be read.
-     * \param promisc bool indicating wether to put the interface in promiscuous mode.(optional)
+     * \param promisc bool indicating whether to put the interface in promiscuous mode.(optional)
      * \param filter A capture filter to be used on the sniffing session.(optional);
      * \param rfmon Indicates if the interface should be put in monitor mode.(optional);
      */
diff --git a/include/tins/tcp.h b/include/tins/tcp.h
index 568a8b7..05b9ea5 100644
--- a/include/tins/tcp.h
+++ b/include/tins/tcp.h
@@ -511,7 +511,7 @@ public:
     uint32_t header_size() const;
     
     /**
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * \sa PDU::matches_response
      * \param ptr The pointer to the buffer.
diff --git a/include/tins/udp.h b/include/tins/udp.h
index b5851bd..9badf83 100644
--- a/include/tins/udp.h
+++ b/include/tins/udp.h
@@ -144,7 +144,7 @@ public:
     void length(uint16_t new_len);
 
     /**
-     * \brief Check wether ptr points to a valid response for this PDU.
+     * \brief Check whether ptr points to a valid response for this PDU.
      *
      * This compares the source and destination ports in the provided
      * response with those stored in this PDU.
diff --git a/include/tins/utils.h b/include/tins/utils.h
index d11917d..c647e19 100644
--- a/include/tins/utils.h
+++ b/include/tins/utils.h
@@ -156,7 +156,7 @@ TINS_API std::set<std::string> network_interfaces();
  * \param gw_addr This parameter will contain the gateway's IP
  * address in case it is found.
  * 
- * \return bool indicating wether the lookup was successfull.
+ * \return bool indicating whether the lookup was successfull.
  */
 TINS_API bool gateway_from_ip(IPv4Address ip, IPv4Address& gw_addr);