diff --git a/mozilla/layout/html/forms/src/nsRadioControlGroup.cpp b/mozilla/layout/html/forms/src/nsRadioControlGroup.cpp
deleted file mode 100644
index af3567818e5..00000000000
--- a/mozilla/layout/html/forms/src/nsRadioControlGroup.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsRadioControlGroup.h"
-
-nsRadioControlGroup::nsRadioControlGroup(nsString& aName)
-:mName(aName), mCheckedRadio(nsnull)
-{
-}
-
-nsRadioControlGroup::~nsRadioControlGroup()
-{
-  mCheckedRadio = nsnull;
-}
-  
-PRInt32 
-nsRadioControlGroup::GetRadioCount() const 
-{ 
-  return mRadios.Count(); 
-}
-
-nsGfxRadioControlFrame*
-nsRadioControlGroup::GetRadioAt(PRInt32 aIndex) const 
-{ 
-  return (nsGfxRadioControlFrame*) mRadios.SafeElementAt(aIndex);
-}
-
-PRBool 
-nsRadioControlGroup::AddRadio(nsGfxRadioControlFrame* aRadio) 
-{ 
-  return mRadios.AppendElement(aRadio);
-}
-
-PRBool 
-nsRadioControlGroup::RemoveRadio(nsGfxRadioControlFrame* aRadio) 
-{ 
-  if (aRadio == mCheckedRadio) {
-    mCheckedRadio = nsnull;
-  }
-  return mRadios.RemoveElement(aRadio);
-}
-
-nsGfxRadioControlFrame*
-nsRadioControlGroup::GetCheckedRadio()
-{
-  return mCheckedRadio;
-}
-
-void    
-nsRadioControlGroup::SetCheckedRadio(nsGfxRadioControlFrame* aRadio)
-{
-  mCheckedRadio = aRadio;
-}
-
-void
-nsRadioControlGroup::GetName(nsAString& aNameResult) const
-{
-  aNameResult = mName;
-}
diff --git a/mozilla/layout/macbuild/layout.xml b/mozilla/layout/macbuild/layout.xml
index 8ec19461675..30773ef51c1 100644
--- a/mozilla/layout/macbuild/layout.xml
+++ b/mozilla/layout/macbuild/layout.xml
@@ -1536,13 +1536,6 @@
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsRadioControlGroup.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>nsGfxRadioControlFrame.cpp</PATH>
@@ -2564,11 +2557,6 @@
                     <PATH>nsGfxCheckboxControlFrame.cpp</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsRadioControlGroup.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>nsGfxRadioControlFrame.cpp</PATH>
@@ -4459,13 +4447,6 @@
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsRadioControlGroup.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>nsGfxRadioControlFrame.cpp</PATH>
@@ -5487,11 +5468,6 @@
                     <PATH>nsGfxCheckboxControlFrame.cpp</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsRadioControlGroup.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>nsGfxRadioControlFrame.cpp</PATH>
@@ -6320,12 +6296,6 @@
                         <PATH>nsFormControlHelper.cpp</PATH>
                         <PATHFORMAT>MacOS</PATHFORMAT>
                     </FILEREF>
-                    <FILEREF>
-                        <TARGETNAME>layout.shlb</TARGETNAME>
-                        <PATHTYPE>Name</PATHTYPE>
-                        <PATH>nsRadioControlGroup.cpp</PATH>
-                        <PATHFORMAT>MacOS</PATHFORMAT>
-                    </FILEREF>
                 </GROUP>
                 <GROUP><NAME>gfx</NAME>
                     <FILEREF>