diff --git a/xpcom/ds/nsProperties.cpp b/xpcom/ds/nsProperties.cpp
index f4b95ee8a74b..9322adae37f7 100644
--- a/xpcom/ds/nsProperties.cpp
+++ b/xpcom/ds/nsProperties.cpp
@@ -8,10 +8,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_AGGREGATED(nsProperties)
-NS_INTERFACE_MAP_BEGIN_AGGREGATED(nsProperties)
-  NS_INTERFACE_MAP_ENTRY(nsIProperties)
-NS_INTERFACE_MAP_END
+NS_IMPL_ISUPPORTS(nsProperties, nsIProperties)
 
 NS_IMETHODIMP
 nsProperties::Get(const char* prop, const nsIID& uuid, void** result) {
diff --git a/xpcom/ds/nsProperties.h b/xpcom/ds/nsProperties.h
index 63099a302751..c45c7361ea19 100644
--- a/xpcom/ds/nsProperties.h
+++ b/xpcom/ds/nsProperties.h
@@ -10,7 +10,6 @@
 #include "nsIProperties.h"
 #include "nsInterfaceHashtable.h"
 #include "nsHashKeys.h"
-#include "nsAgg.h"
 #include "mozilla/Attributes.h"
 
 typedef nsInterfaceHashtable<nsCharPtrHashKey, nsISupports>
@@ -18,11 +17,13 @@ typedef nsInterfaceHashtable<nsCharPtrHashKey, nsISupports>
 
 class nsProperties final : public nsIProperties, public nsProperties_HashBase {
  public:
-  NS_DECL_AGGREGATED
+  NS_DECL_ISUPPORTS
   NS_DECL_NSIPROPERTIES
 
-  nsProperties() { NS_INIT_AGGREGATED(nullptr); }
-  ~nsProperties() {}
+  nsProperties() = default;
+
+ private:
+  ~nsProperties() = default;
 };
 
 #endif /* nsProperties_h___ */