diff --git a/mozilla/cmd/macfe/gui/macgui.cp b/mozilla/cmd/macfe/gui/macgui.cp
index ac635526871..f44bebb9937 100644
--- a/mozilla/cmd/macfe/gui/macgui.cp
+++ b/mozilla/cmd/macfe/gui/macgui.cp
@@ -784,26 +784,28 @@ void CEditBroadcaster::UserChangedText()
 	BroadcastMessage(msg_EditField, this);
 }
 
+#if 0
 /*****************************************************************************
- * class CGAEditBroadcaster
- * LGAEditField that notifies listeners about its changes
+ * class CEditBroadcaster
+ * LEditField that notifies listeners about its changes
  *****************************************************************************/
 
-CGAEditBroadcaster::CGAEditBroadcaster(LStream *inStream)
-	:	LGAEditField(inStream)
+CEditBroadcaster::CEditBroadcaster(LStream *inStream)
+	:	LEditField(inStream)
 {
 }
 
-void CGAEditBroadcaster::UserChangedText()
+void CEditBroadcaster::UserChangedText()
 {
 	BroadcastMessage(msg_EditField, this);
 }
 
 void
-CGAEditBroadcaster::BroadcastValueMessage()
+CEditBroadcaster::BroadcastValueMessage()
 {
 	BroadcastMessage(msg_EditField, this);
 }
+#endif
 
 /*****************************************************************************
  * class CTextEdit
diff --git a/mozilla/cmd/macfe/gui/macgui.h b/mozilla/cmd/macfe/gui/macgui.h
index 7ed702dad8d..981674d683d 100644
--- a/mozilla/cmd/macfe/gui/macgui.h
+++ b/mozilla/cmd/macfe/gui/macgui.h
@@ -258,23 +258,27 @@ public:
 	void UserChangedText();
 };
 
+
+#if 0
 /*****************************************************************************
- * class CGAEditBroadcaster
+ * class CEditBroadcaster
  * LGAEditField that notifies listeners about its changes
  *****************************************************************************/
-class CGAEditBroadcaster	: public LGAEditField
+class CEditBroadcaster	: public LEditField
 {
 public:
 
 	// ¥¥ Constructors/destructors
 	enum { class_ID = 'Gebr' };
-	CGAEditBroadcaster(LStream *inStream);
+	CEditBroadcaster(LStream *inStream);
 
 	// ¥¥ Misc
 	// Broadcast
 	void BroadcastValueMessage();
 	void UserChangedText();
 };
+#endif
+
 
 /*****************************************************************************
  * class CTextEdit
diff --git a/mozilla/cmd/macfe/gui/macutil.cp b/mozilla/cmd/macfe/gui/macutil.cp
index 0933eb5f905..ef432402ec6 100644
--- a/mozilla/cmd/macfe/gui/macutil.cp
+++ b/mozilla/cmd/macfe/gui/macutil.cp
@@ -511,7 +511,7 @@ void * StructCopy(const void * struc, UInt32 size)
 }
 
 
-void SetMenuSize( LStdPopupMenu* popup, short shouldBe )
+void SetMenuSize( LPopupButton* popup, short shouldBe )
 {
 	MenuHandle		menu;
 	short			count;
diff --git a/mozilla/cmd/macfe/gui/macutil.h b/mozilla/cmd/macfe/gui/macutil.h
index 2e6bb42e0db..1a21ae635ea 100644
--- a/mozilla/cmd/macfe/gui/macutil.h
+++ b/mozilla/cmd/macfe/gui/macutil.h
@@ -26,6 +26,7 @@
 #include <LControl.h>
 #include <LPane.h>
 #include <LGAPopup.h>
+#include <LPopupButton.h>
 #include <Processes.h>
 
 #include "PascalString.h"
@@ -172,7 +173,7 @@ void CreateMenuString( CStr255& itemName );
 Handle TextHandleToHardLineBreaks(CSimpleTextView &inTextView);
 
 // ¥Êsets the number of entries in popup to be shouldBe
-void SetMenuSize( LStdPopupMenu* popup, short shouldBe );
+void SetMenuSize( LPopupButton* popup, short shouldBe );
 void SetMenuSizeForLGAPopup( LGAPopup* popup, short shouldBe );
 
 void SetMenuItem( CommandT whichItem, Boolean toState );