diff -u -urN --exclude 'obj-*' --exclude '*~' OpenCV-2.3.1.orig/modules/legacy/src/facedetection.cpp OpenCV-2.3.1/modules/legacy/src/facedetection.cpp
--- OpenCV-2.3.1.orig/modules/legacy/src/facedetection.cpp	2011-09-12 20:43:40.000000000 +0200
+++ OpenCV-2.3.1/modules/legacy/src/facedetection.cpp	2012-01-16 12:02:50.000000000 +0100
@@ -66,7 +66,7 @@
     m_seqRects = NULL;
     m_iNumLayers = 16;
     assert(m_iNumLayers <= MAX_LAYERS);
-    m_pFaceList = new List();
+    m_pFaceList = new FaceDetectionList();
     
 
 
@@ -241,7 +241,7 @@
 void FaceDetection::ResetImage()
 {
         delete m_pFaceList;
-        m_pFaceList = new List();
+        m_pFaceList = new FaceDetectionList();
 
 }//FaceDetection::ResetImage
 
@@ -424,16 +424,16 @@
 
 
 //////
-//List Class
+//FaceDetectionList Class
 /////
-ListElem::ListElem()
+FaceDetectionListElem::FaceDetectionListElem()
 {
     m_pNext = this;
     m_pPrev = this;
     m_pFace = NULL;
-}///ListElem::ListElem()
+}///FaceDetectionListElem::FaceDetectionListElem()
 
-ListElem::ListElem(Face * pFace,ListElem * pHead)
+FaceDetectionListElem::FaceDetectionListElem(Face * pFace,FaceDetectionListElem * pHead)
 {
     m_pNext = pHead;
     m_pPrev = pHead->m_pPrev;
@@ -441,26 +441,26 @@
     pHead->m_pPrev = this;
 
     m_pFace = pFace;
-}//ListElem::ListElem(Face * pFace)
+}//FaceDetectionListElem::FaceDetectionListElem(Face * pFace)
 
 
 
-ListElem::~ListElem()
+FaceDetectionListElem::~FaceDetectionListElem()
 {
     delete m_pFace;
     m_pNext->m_pPrev = m_pPrev;
     m_pPrev->m_pNext = m_pNext;
 
-}//ListElem::~ListElem()
+}//FaceDetectionListElem::~FaceDetectionListElem()
 
-List::List()
+FaceDetectionList::FaceDetectionList()
 {
-    m_pHead = new ListElem();
+    m_pHead = new FaceDetectionListElem();
     m_FacesCount = 0;
     m_pCurElem = m_pHead;
-}//List::List()
+}//FaceDetectionList::FaceDetectionList()
 
-List::~List()
+FaceDetectionList::~FaceDetectionList()
 {
     void * tmp;
     while((tmp = m_pHead->m_pNext->m_pFace) != 0)
@@ -468,19 +468,19 @@
 
     delete m_pHead;
 
-}//List::~List()
+}//FaceDetectionList::~FaceDetectionList()
 
 
-int List::AddElem(Face * pFace)
+int FaceDetectionList::AddElem(Face * pFace)
 {
-    new ListElem(pFace,m_pHead);
+    new FaceDetectionListElem(pFace,m_pHead);
     return m_FacesCount++;
-}//List::AddElem(Face * pFace)
+}//FaceDetectionList::AddElem(Face * pFace)
 
-Face * List::GetData()
+Face * FaceDetectionList::GetData()
 {
     m_pCurElem = m_pCurElem->m_pNext;
     return m_pCurElem->m_pFace;
-}//Face * List::GetData()
+}//Face * FaceDetectionList::GetData()
 
 
diff -u -urN --exclude 'obj-*' --exclude '*~' OpenCV-2.3.1.orig/modules/legacy/src/_facedetection.h OpenCV-2.3.1/modules/legacy/src/_facedetection.h
--- OpenCV-2.3.1.orig/modules/legacy/src/_facedetection.h	2011-09-12 20:43:40.000000000 +0200
+++ OpenCV-2.3.1/modules/legacy/src/_facedetection.h	2012-01-16 12:02:23.000000000 +0100
@@ -296,29 +296,29 @@
 }; 
 
 
-class ListElem
+class FaceDetectionListElem
 {
 public:
-    ListElem();
-    ListElem(Face * pFace,ListElem * pHead);
-    virtual ~ListElem();
-    ListElem * m_pNext;
-    ListElem * m_pPrev;
+    FaceDetectionListElem();
+    FaceDetectionListElem(Face * pFace,FaceDetectionListElem * pHead);
+    virtual ~FaceDetectionListElem();
+    FaceDetectionListElem * m_pNext;
+    FaceDetectionListElem * m_pPrev;
     Face * m_pFace;
-};//class ListElem
+};//class FaceDetectionListElem
 
-class List
+class FaceDetectionList
 {
 public:
-    List();
+    FaceDetectionList();
     int AddElem(Face * pFace);
-    virtual ~List();
+    virtual ~FaceDetectionList();
     Face* GetData();
         long m_FacesCount;
 private:
-    ListElem * m_pHead;
-    ListElem * m_pCurElem;
-};//class List
+    FaceDetectionListElem * m_pHead;
+    FaceDetectionListElem * m_pCurElem;
+};//class FaceDetectionList
 
 
 class FaceDetection  
@@ -341,7 +341,7 @@
     CvSeq* m_seqRects;
     
     bool m_bBoosting;
-    List * m_pFaceList;
+    FaceDetectionList * m_pFaceList;
 
 protected:
     void ResetImage();
diff -u -urN --exclude 'obj-*' --exclude '*~' OpenCV-2.3.1.orig/modules/legacy/src/facedetection.h OpenCV-2.3.1/modules/legacy/src/facedetection.h
--- OpenCV-2.3.1.orig/modules/legacy/src/facedetection.h	2011-09-12 20:43:40.000000000 +0200
+++ OpenCV-2.3.1/modules/legacy/src/facedetection.h	2012-01-16 12:01:58.000000000 +0100
@@ -23,29 +23,29 @@
 
 //class Face;
 
-class ListElem
+class FaceDetectionListElem
 {
 public:
-	ListElem();
-	ListElem(Face * pFace,ListElem * pHead);
-	virtual ~ListElem();
-	ListElem * m_pNext;
-	ListElem * m_pPrev;
+	FaceDetectionListElem();
+	FaceDetectionListElem(Face * pFace,FaceDetectionListElem * pHead);
+	virtual ~FaceDetectionListElem();
+	FaceDetectionListElem * m_pNext;
+	FaceDetectionListElem * m_pPrev;
 	Face * m_pFace;
-};//class ListElem
+};//class FaceDetectionListElem
 
-class List
+class FaceDetectionList
 {
 public:
-	List();
+	FaceDetectionList();
 	int AddElem(Face * pFace);
-	virtual ~List();
+	virtual ~FaceDetectionList();
 	Face* GetData();
         long m_FacesCount;
 private:
-	ListElem * m_pHead;
-	ListElem * m_pCurElem;
-};//class List
+	FaceDetectionListElem * m_pHead;
+	FaceDetectionListElem * m_pCurElem;
+};//class FaceDetectionList
 
 
 class FaceDetection  
@@ -68,7 +68,7 @@
 	CvSeq* m_seqRects;
 	
 	bool m_bBoosting;
-	List * m_pFaceList;
+	FaceDetectionList * m_pFaceList;
 
 protected:
 	void ResetImage();