Index: libsigc++-2.0-2.0.17/sigc++/signal.h
===================================================================
--- libsigc++-2.0-2.0.17.orig/sigc++/signal.h	2008-01-25 01:12:12.000000000 +0000
+++ libsigc++-2.0-2.0.17/sigc++/signal.h	2008-01-25 02:23:16.000000000 +0000
@@ -1672,7 +1672,7 @@
    * It is not available when using the SUN Forte compiler.
    * @deprecated slot_list_type;
    */
-  typedef slot_list_type slot_list;
+  typedef slot_list_type slot_list_t;
 #endif
 
   /** Add a slot to the list of slots.
@@ -1781,7 +1781,7 @@
    * It is not available when using the SUN Forte compiler.
    * @deprecated slot_list_type;
    */
-  typedef slot_list_type slot_list;
+  typedef slot_list_type slot_list_t;
 #endif
 
   /** Add a slot to the list of slots.
@@ -1892,7 +1892,7 @@
    * It is not available when using the SUN Forte compiler.
    * @deprecated slot_list_type;
    */
-  typedef slot_list_type slot_list;
+  typedef slot_list_type slot_list_t;
 #endif
 
   /** Add a slot to the list of slots.
@@ -2005,7 +2005,7 @@
    * It is not available when using the SUN Forte compiler.
    * @deprecated slot_list_type;
    */
-  typedef slot_list_type slot_list;
+  typedef slot_list_type slot_list_t;
 #endif
 
   /** Add a slot to the list of slots.
@@ -2120,7 +2120,7 @@
    * It is not available when using the SUN Forte compiler.
    * @deprecated slot_list_type;
    */
-  typedef slot_list_type slot_list;
+  typedef slot_list_type slot_list_t;
 #endif
 
   /** Add a slot to the list of slots.
@@ -2237,7 +2237,7 @@
    * It is not available when using the SUN Forte compiler.
    * @deprecated slot_list_type;
    */
-  typedef slot_list_type slot_list;
+  typedef slot_list_type slot_list_t;
 #endif
 
   /** Add a slot to the list of slots.
@@ -2356,7 +2356,7 @@
    * It is not available when using the SUN Forte compiler.
    * @deprecated slot_list_type;
    */
-  typedef slot_list_type slot_list;
+  typedef slot_list_type slot_list_t;
 #endif
 
   /** Add a slot to the list of slots.
@@ -2477,7 +2477,7 @@
    * It is not available when using the SUN Forte compiler.
    * @deprecated slot_list_type;
    */
-  typedef slot_list_type slot_list;
+  typedef slot_list_type slot_list_t;
 #endif
 
   /** Add a slot to the list of slots.
Index: libsigc++-2.0-2.0.17/tests/test_copy_invalid_slot.cc
===================================================================
--- libsigc++-2.0-2.0.17.orig/tests/test_copy_invalid_slot.cc	2008-01-25 02:25:16.000000000 +0000
+++ libsigc++-2.0-2.0.17/tests/test_copy_invalid_slot.cc	2008-01-25 02:28:05.000000000 +0000
@@ -1,3 +1,5 @@
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <sigc++/sigc++.h>