diff -urN gnome-phone-manager-0.3/libgsm/gsm.cc gnome-phone-manager-0.3~/libgsm/gsm.cc
--- gnome-phone-manager-0.3/libgsm/gsm.cc	2004-06-18 11:19:51.000000000 +0200
+++ gnome-phone-manager-0.3~/libgsm/gsm.cc	2004-06-19 22:11:31.982179368 +0200
@@ -134,7 +134,7 @@
 	e->setMessageQueue(&newMessages);
 	mt->setEventHandler(e);
 	} catch (gsmlib::GsmException &ge) {
-        cerr << ("[ERROR]: ") << ge.what() << endl;
+	std::cerr << ("[ERROR]: ") << ge.what() << std::endl;
         m_signal_status.emit (PHONELISTENER_ERROR);
         // signify exit by error
         return false;
@@ -201,7 +201,7 @@
         mt->waitEvent(&timeoutVal);
         sms_loop_once ();
 	} catch (gsmlib::GsmException &ge) {
-        cerr << ("[ERROR]: ") << ge.what() << endl;
+	std::cerr << ("[ERROR]: ") << ge.what() << std::endl;
         disconnect ();
         delete mt;
         m_signal_status.emit (PHONELISTENER_ERROR);
@@ -277,7 +277,7 @@
 			sendQueue.erase (sendQueue.begin());
 		}
 	} catch (gsmlib::GsmException &ge) {
-        cerr << ("[ERROR]: ") << ge.what() << endl;
+	std::cerr << ("[ERROR]: ") << ge.what() << std::endl;
         disconnect ();
         delete mt;
         m_signal_status.emit(PHONELISTENER_ERROR);
diff -urN gnome-phone-manager-0.3/libgsm/gsm.h gnome-phone-manager-0.3~/libgsm/gsm.h
--- gnome-phone-manager-0.3/libgsm/gsm.h	2004-06-18 11:18:41.000000000 +0200
+++ gnome-phone-manager-0.3~/libgsm/gsm.h	2004-06-19 22:17:15.291988344 +0200
@@ -8,6 +8,12 @@
 #include <sigc++/sigc++.h>
 
 #include <time.h>
+#include <vector>
+#include <string>
+
+
+using std::vector;
+using std::string;
 
 // local class to handle SMS events