diff --git a/widget/src/motif/nsButton.h b/widget/src/motif/nsButton.h
index 2c994f7f74af..b5147cb19248 100644
--- a/widget/src/motif/nsButton.h
+++ b/widget/src/motif/nsButton.h
@@ -72,7 +72,7 @@ private:
     AggButton();
     virtual ~AggButton();
 
-    AGGRRGATE_METHOD_DEF
+    AGGREGATE_METHOD_DEF
 
     // nsIButton
     virtual void SetLabel(const nsString &aText);
@@ -80,6 +80,7 @@ private:
 
   };
   AggButton mAggWidget;
+  friend class AggButton;
 
 
 };
diff --git a/widget/src/motif/nsCheckButton.h b/widget/src/motif/nsCheckButton.h
index 50bdff973296..628dc448a1d1 100644
--- a/widget/src/motif/nsCheckButton.h
+++ b/widget/src/motif/nsCheckButton.h
@@ -85,7 +85,7 @@ private:
     AggCheckButton();
     virtual ~AggCheckButton();
 
-    AGGRRGATE_METHOD_DEF
+    AGGREGATE_METHOD_DEF
 
     // nsICheckButton
     virtual void   SetLabel(const nsString &aText);
@@ -96,7 +96,7 @@ private:
 
   };
   AggCheckButton mAggWidget;
-
+  friend class AggCheckButton;
 
 };
 
diff --git a/widget/src/motif/nsFileWidget.h b/widget/src/motif/nsFileWidget.h
index dfe0287d0738..7f8f0a7ffaff 100644
--- a/widget/src/motif/nsFileWidget.h
+++ b/widget/src/motif/nsFileWidget.h
@@ -95,7 +95,7 @@ class nsFileWidget : public nsWindow
       AggFileWidget();
       virtual ~AggFileWidget();
   
-      AGGRRGATE_METHOD_DEF
+      AGGREGATE_METHOD_DEF
   
       // nsIFileWidget
       virtual void            Create( nsIWidget *aParent,
@@ -115,7 +115,7 @@ class nsFileWidget : public nsWindow
       virtual void            OnCancel();
     };
     AggFileWidget mAggWidget;
-
+    friend class AggFileWidget;
 
 };
 
diff --git a/widget/src/motif/nsListBox.h b/widget/src/motif/nsListBox.h
index ce8830442383..a9ee2d15a3a2 100644
--- a/widget/src/motif/nsListBox.h
+++ b/widget/src/motif/nsListBox.h
@@ -76,7 +76,7 @@ private:
     AggListBox();
     virtual ~AggListBox();
 
-    AGGRRGATE_METHOD_DEF
+    AGGREGATE_METHOD_DEF
 
     // nsIListBox
     void      SetMultipleSelection(PRBool aMultipleSelections);
@@ -94,6 +94,7 @@ private:
 
   };
   AggListBox mAggWidget;
+  friend class AggListBox;
 
 };
 
diff --git a/widget/src/motif/nsRadioButton.h b/widget/src/motif/nsRadioButton.h
index c0449d042aca..21f0b5ca465d 100644
--- a/widget/src/motif/nsRadioButton.h
+++ b/widget/src/motif/nsRadioButton.h
@@ -87,7 +87,7 @@ private:
     AggRadioButton();
     virtual ~AggRadioButton();
 
-    AGGRRGATE_METHOD_DEF
+    AGGREGATE_METHOD_DEF
 
     // nsIRadioButton
     virtual void   SetLabel(const nsString &aText);
@@ -97,7 +97,7 @@ private:
 
   };
   AggRadioButton mAggWidget;
-
+  friend class AggRadioButton;
 
 };
 
diff --git a/widget/src/motif/nsScrollbar.h b/widget/src/motif/nsScrollbar.h
index 193a8655885c..c50b82dfa420 100644
--- a/widget/src/motif/nsScrollbar.h
+++ b/widget/src/motif/nsScrollbar.h
@@ -85,7 +85,7 @@ private:
     AggScrollbar();
     virtual ~AggScrollbar();
 
-    AGGRRGATE_METHOD_DEF
+    AGGREGATE_METHOD_DEF
 
     // nsIScrollbar part
     virtual void      SetMaxRange(PRUint32 aEndRange);
@@ -100,7 +100,7 @@ private:
                                   PRUint32 aPosition, PRUint32 aLineIncrement);
   };
   AggScrollbar mAggWidget;
-
+  friend class AggScrollbar;
 
 
 };
diff --git a/widget/src/motif/nsTextWidget.h b/widget/src/motif/nsTextWidget.h
index 02ef26b87f02..22084161242e 100644
--- a/widget/src/motif/nsTextWidget.h
+++ b/widget/src/motif/nsTextWidget.h
@@ -93,7 +93,7 @@ private:
     AggTextWidget();
     virtual ~AggTextWidget();
 
-    AGGRRGATE_METHOD_DEF
+    AGGREGATE_METHOD_DEF
 
     virtual void      SelectAll();
     virtual void      SetMaxTextLength(PRUint32 aChars);
@@ -111,7 +111,7 @@ private:
 
   };
   AggTextWidget mAggWidget;
-
+  friend class AggTextWidget;
 
 };
 
diff --git a/widget/src/motif/nsWindow.h b/widget/src/motif/nsWindow.h
index c4bee028f970..ff694df36a06 100644
--- a/widget/src/motif/nsWindow.h
+++ b/widget/src/motif/nsWindow.h
@@ -183,7 +183,7 @@ public:
 
 };
 
-#define AGGRRGATE_METHOD_DEF \
+#define AGGREGATE_METHOD_DEF \
 public:                                                                     \
   NS_IMETHOD QueryInterface(REFNSIID aIID,                                  \
                             void** aInstancePtr);                           \