diff --git a/src/common/data-rate.h b/src/common/data-rate.h
index 90a81ace8..9cad5d413 100644
--- a/src/common/data-rate.h
+++ b/src/common/data-rate.h
@@ -80,7 +80,6 @@ public:
    */
   uint64_t GetBitRate() const;
 
-  ATTRIBUTE_HELPER_HEADER_1 (DataRate);
 private:
   uint64_t m_bps;
   static uint64_t Parse(const std::string);
diff --git a/src/core/attribute-helper.h b/src/core/attribute-helper.h
index 1b31326b0..2757145fc 100644
--- a/src/core/attribute-helper.h
+++ b/src/core/attribute-helper.h
@@ -83,8 +83,7 @@ MakeSimpleAttributeChecker (std::string name, std::string underlying)
  *
  * The simple macros are implemented in terms of the complex
  * macros and should generally be prefered over the complex macros:
- *    - \ref ATTRIBUTE_HELPER_HEADER_1,
- *    - \ref ATTRIBUTE_HELPER_HEADER_2, and,
+ *    - \ref ATTRIBUTE_HELPER_HEADER, and,
  *    - \ref ATTRIBUTE_HELPER_CPP,
  */
 
@@ -232,15 +231,6 @@ MakeSimpleAttributeChecker (std::string name, std::string underlying)
 #define ATTRIBUTE_CONVERTER_IMPLEMENT(type)
 
 
-/**
- * \ingroup AttributeHelper
- * \param type the name of the class
- *
- * This macro should be invoked from a public section of the class
- * declaration.
- */
-#define ATTRIBUTE_HELPER_HEADER_1(type)
-
 /**
  * \ingroup AttributeHelper
  * \param type the name of the class
diff --git a/src/core/object-factory.h b/src/core/object-factory.h
index ccfdc4177..4161af14b 100644
--- a/src/core/object-factory.h
+++ b/src/core/object-factory.h
@@ -77,7 +77,6 @@ public:
   template <typename T>
   Ptr<T> Create (void) const;
 
-  ATTRIBUTE_HELPER_HEADER_1 (ObjectFactory);
 private:
   friend std::ostream & operator << (std::ostream &os, const ObjectFactory &factory);
   friend std::istream & operator >> (std::istream &is, ObjectFactory &factory);
diff --git a/src/core/type-id.h b/src/core/type-id.h
index 713f8cb5a..09555a4ea 100644
--- a/src/core/type-id.h
+++ b/src/core/type-id.h
@@ -354,7 +354,6 @@ public:
   TypeId ();
   ~TypeId ();
 
-  ATTRIBUTE_HELPER_HEADER_1 (TypeId);
 private:
   friend class AttributeList;
   friend bool operator == (TypeId a, TypeId b);
diff --git a/src/devices/wifi/ssid.h b/src/devices/wifi/ssid.h
index 0feed168b..9da9900b6 100644
--- a/src/devices/wifi/ssid.h
+++ b/src/devices/wifi/ssid.h
@@ -49,7 +49,6 @@ public:
   Buffer::Iterator Serialize (Buffer::Iterator i) const;
   Buffer::Iterator Deserialize (Buffer::Iterator i);
 
-  ATTRIBUTE_HELPER_HEADER_1 (Ssid);
 private:
   uint8_t m_ssid[33];
   uint8_t m_length;
diff --git a/src/devices/wifi/wifi-mode.h b/src/devices/wifi/wifi-mode.h
index 9b15a203e..507240485 100644
--- a/src/devices/wifi/wifi-mode.h
+++ b/src/devices/wifi/wifi-mode.h
@@ -107,7 +107,6 @@ class WifiMode
    */
   WifiMode ();
 
-  ATTRIBUTE_HELPER_HEADER_1 (WifiMode);
 private:
   friend class WifiModeFactory;
   WifiMode (uint32_t uid);
diff --git a/src/mobility/rectangle.h b/src/mobility/rectangle.h
index 3777ee1a6..b60708052 100644
--- a/src/mobility/rectangle.h
+++ b/src/mobility/rectangle.h
@@ -61,8 +61,6 @@ public:
   double xMax;
   double yMin;
   double yMax;
-
-  ATTRIBUTE_HELPER_HEADER_1 (Rectangle);
 };
 
 std::ostream &operator << (std::ostream &os, const Rectangle &rectangle);
diff --git a/src/mobility/vector.h b/src/mobility/vector.h
index 3517f7d36..30bed8dc0 100644
--- a/src/mobility/vector.h
+++ b/src/mobility/vector.h
@@ -57,8 +57,6 @@ public:
    * z coordinate of vector vector
    */
   double z;
-
-  ATTRIBUTE_HELPER_HEADER_1 (Vector);
 };
 
 double CalculateDistance (const Vector &a, const Vector &b);
diff --git a/src/node/address.h b/src/node/address.h
index e5b6c82e3..b49c14bac 100644
--- a/src/node/address.h
+++ b/src/node/address.h
@@ -154,7 +154,6 @@ public:
    */
   static uint8_t Register (void);
 
-  ATTRIBUTE_HELPER_HEADER_1 (Address);
 private:
   friend bool operator == (const Address &a, const Address &b);
   friend bool operator < (const Address &a, const Address &b);
diff --git a/src/node/ipv4-address.h b/src/node/ipv4-address.h
index fc2dc7fe7..c88910966 100644
--- a/src/node/ipv4-address.h
+++ b/src/node/ipv4-address.h
@@ -142,7 +142,6 @@ public:
   static Ipv4Address GetBroadcast (void);
   static Ipv4Address GetLoopback (void);
 
-  ATTRIBUTE_HELPER_HEADER_1 (Ipv4Address);
 private:
   Address ConvertTo (void) const;
   static uint8_t GetType (void);
@@ -180,7 +179,6 @@ public:
   static Ipv4Mask GetLoopback (void);
   static Ipv4Mask GetZero (void);
 
-  ATTRIBUTE_HELPER_HEADER_1 (Ipv4Mask);
 private:
   uint32_t m_mask;
 };
diff --git a/src/node/mac48-address.h b/src/node/mac48-address.h
index 6227e2e1b..e1f42e071 100644
--- a/src/node/mac48-address.h
+++ b/src/node/mac48-address.h
@@ -96,7 +96,6 @@ public:
    */
   static Mac48Address GetBroadcast (void);
 
-  ATTRIBUTE_HELPER_HEADER_1 (Mac48Address);
 private:
   /**
    * \returns a new Address instance