diff --git a/include/arp.h b/include/arp.h
index f8c78e9..61fd434 100644
--- a/include/arp.h
+++ b/include/arp.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef __ARP_H
-#define __ARP_H
+#ifndef TINS_ARP_H
+#define TINS_ARP_H
 
 
 #include <string>
@@ -309,4 +309,4 @@ namespace Tins {
         arphdr _arp;
     };
 };
-#endif
+#endif //TINS_ARP_H
diff --git a/include/bootp.h b/include/bootp.h
index 46589a8..196f4fc 100644
--- a/include/bootp.h
+++ b/include/bootp.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __BOOTP_H
-#define __BOOTP_H
+#ifndef TINS_BOOTP_H
+#define TINS_BOOTP_H
 
 #include <stdint.h>
 #include <stdint.h>
@@ -318,4 +318,4 @@ namespace Tins {
     };
 };
 
-#endif
+#endif // TINS_BOOTP_H
diff --git a/include/constants.h b/include/constants.h
index 838a3e1..84f2620 100644
--- a/include/constants.h
+++ b/include/constants.h
@@ -1,5 +1,26 @@
-#ifndef __CONSTANTS_H
-#define __CONSTANTS_H
+/*
+ * libtins is a net packet wrapper library for crafting and
+ * interpreting sniffed packets.
+ *
+ * Copyright (C) 2011 Nasel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef TINS_CONSTANTS_H
+#define TINS_CONSTANTS_H
 
 namespace Tins {
     /**
@@ -125,4 +146,4 @@ namespace Tins {
 };
 
 
-#endif
+#endif // TINS_CONSTANTS_H
diff --git a/include/dhcp.h b/include/dhcp.h
index 723625a..1bdcabc 100644
--- a/include/dhcp.h
+++ b/include/dhcp.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __DHCP_H
-#define __DHCP_H
+#ifndef TINS_DHCP_H
+#define TINS_DHCP_H
 
 
 #include <list>
@@ -413,4 +413,4 @@ namespace Tins {
     };
 };
 
-#endif
+#endif // TINS_DHCP_H
diff --git a/include/dns.h b/include/dns.h
index 87d2d90..b760b03 100644
--- a/include/dns.h
+++ b/include/dns.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __DNS_H
-#define __DNS_H
+#ifndef TINS_DNS_H
+#define TINS_DNS_H
 
 #include <stdint.h>
 #include <list>
@@ -584,5 +584,5 @@ namespace Tins {
     };
 };
 
-#endif // __DNS_H
+#endif // TINS_DNS_H
 
diff --git a/include/dot11.h b/include/dot11.h
index eebd1b8..6df8891 100644
--- a/include/dot11.h
+++ b/include/dot11.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __DOT_11
-#define __DOT_11
+#ifndef TINS_DOT_11
+#define TINS_DOT_11
 
 #include <list>
 #include <stdint.h>
@@ -3878,4 +3878,4 @@ namespace Tins {
 
 
 
-#endif
+#endif // TINS_DOT_11
diff --git a/include/eapol.h b/include/eapol.h
index 8e906d5..0b89e40 100644
--- a/include/eapol.h
+++ b/include/eapol.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __EAPOL_H
-#define __EAPOL_H
+#ifndef TINS_EAPOL_H
+#define TINS_EAPOL_H
 
 
 #include "pdu.h"
@@ -559,4 +559,4 @@ namespace Tins {
     };
 };
 
-#endif
+#endif // TINS_EAPOL_H
diff --git a/include/ethernetII.h b/include/ethernetII.h
index fbc5d91..d3f2c85 100644
--- a/include/ethernetII.h
+++ b/include/ethernetII.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __ETHERNET_II_H
-#define __ETHERNET_II_H
+#ifndef TINS_ETHERNET_II_H
+#define TINS_ETHERNET_II_H
 
 #include <stdint.h>
 #include <stdexcept>
@@ -225,4 +225,4 @@ namespace Tins {
 };
 
 
-#endif
+#endif // TINS_ETHERNET_II_H
diff --git a/include/icmp.h b/include/icmp.h
index 2ad11a2..80693d4 100644
--- a/include/icmp.h
+++ b/include/icmp.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __ICMP_H
-#define __ICMP_H
+#ifndef TINS_ICMP_H
+#define TINS_ICMP_H
 
 
 #include "pdu.h"
@@ -344,4 +344,4 @@ namespace Tins {
     };
 };
 
-#endif
+#endif // TINS_ICMP_H
diff --git a/include/ieee802-3.h b/include/ieee802-3.h
index 7abb48e..b09c045 100644
--- a/include/ieee802-3.h
+++ b/include/ieee802-3.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __IEEE802_3_H
-#define __IEEE802_3_H
+#ifndef TINS_IEEE802_3_H
+#define TINS_IEEE802_3_H
 
 #include <stdint.h>
 #include <stdexcept>
@@ -218,4 +218,4 @@ namespace Tins {
 };
 
 
-#endif
+#endif // TINS_IEEE802_3_H
diff --git a/include/llc.h b/include/llc.h
index 9cc733f..3ff4e8b 100644
--- a/include/llc.h
+++ b/include/llc.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __IEEE8022_H
-#define __IEEE8022_H
+#ifndef TINS_IEEE8022_H
+#define TINS_IEEE8022_H
 
 #include <list>
 #include <utility>
@@ -355,4 +355,4 @@ namespace Tins {
 
 };
 
-#endif
+#endif // TINS_IEEE8022_H
diff --git a/include/packetsender.h b/include/packetsender.h
index 72cf9da..ceb436a 100644
--- a/include/packetsender.h
+++ b/include/packetsender.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __PACKET_SENDER_H
-#define __PACKET_SENDER_H
+#ifndef TINS_PACKET_SENDER_H
+#define TINS_PACKET_SENDER_H
 
 
 #include <vector>
@@ -180,4 +180,4 @@ namespace Tins {
     };
 };
 
-#endif
+#endif // TINS_PACKET_SENDER_H
diff --git a/include/pdu.h b/include/pdu.h
index 6801ee9..239b632 100644
--- a/include/pdu.h
+++ b/include/pdu.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __PDU_H
-#define __PDU_H
+#ifndef TINS_PDU_H
+#define TINS_PDU_H
 
 
 #include <stdint.h>
@@ -302,4 +302,4 @@ namespace Tins {
     };
 };
 
-#endif
+#endif // TINS_PDU_H
diff --git a/include/radiotap.h b/include/radiotap.h
index f0985f0..4949796 100644
--- a/include/radiotap.h
+++ b/include/radiotap.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __RADIOTAP_H
-#define __RADIOTAP_H
+#ifndef TINS_RADIOTAP_H
+#define TINS_RADIOTAP_H
 
 #include <stdexcept>
 #include "pdu.h"
@@ -319,4 +319,5 @@ namespace Tins {
         uint16_t _rx_flags;
     };
 };
-#endif
+
+#endif // TINS_RADIOTAP_H
diff --git a/include/rawpdu.h b/include/rawpdu.h
index d4a894e..ec44db6 100644
--- a/include/rawpdu.h
+++ b/include/rawpdu.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __RAWPDU_H
-#define __RAWPDU_H
+#ifndef TINS_RAWPDU_H
+#define TINS_RAWPDU_H
 
 
 #include "pdu.h"
@@ -87,4 +87,4 @@ namespace Tins {
 };
 
 
-#endif
+#endif // TINS_RAWPDU_H
diff --git a/include/snap.h b/include/snap.h
index edc70d0..56d100d 100644
--- a/include/snap.h
+++ b/include/snap.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __IEEE8022_H
-#define __IEEE8022_H
+#ifndef TINS_IEEE8022_H
+#define TINS_IEEE8022_H
 
 
 #include <stdint.h>
@@ -167,4 +167,4 @@ namespace Tins {
     
 };
 
-#endif
+#endif // TINS_IEEE8022_H
diff --git a/include/sniffer.h b/include/sniffer.h
index a6ad00c..3b3e521 100644
--- a/include/sniffer.h
+++ b/include/sniffer.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef __SNIFFER_H
-#define __SNIFFER_H
+#ifndef TINS_SNIFFER_H
+#define TINS_SNIFFER_H
 
 
 #include <pcap.h>
@@ -152,4 +152,4 @@ namespace Tins {
     };
 };
     
-#endif
+#endif // TINS_SNIFFER_H
diff --git a/include/tcp.h b/include/tcp.h
index 149ab70..c4736a2 100644
--- a/include/tcp.h
+++ b/include/tcp.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TCP_H
-#define __TCP_H
+#ifndef TINS_TCP_H
+#define TINS_TCP_H
 
 
 #include <list>
@@ -465,4 +465,4 @@ namespace Tins {
     };
 };
 
-#endif
+#endif // TINS_TCP_H
diff --git a/include/tins.h b/include/tins.h
index 39247de..9106ea1 100644
--- a/include/tins.h
+++ b/include/tins.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __TINS_H
-#define __TINS_H
+#ifndef TINS_TINS_H
+#define TINS_TINS_H
 
 #include "arp.h"
 #include "bootp.h"
@@ -39,5 +39,6 @@
 #include "tcp.h"
 #include "udp.h"
 #include "utils.h"
+#include "dns.h"
 
-#endif
+#endif // TINS_TINS_H