--- gsmlib-1.10/gsmlib/gsm_unix_serial.h~	2002-09-22 13:51:10.000000000 +0200
+++ gsmlib-1.10/gsmlib/gsm_unix_serial.h	2004-03-14 04:16:26.000000000 +0100
@@ -13,6 +13,7 @@
 #ifndef GSM_UNIX_SERIAL_H
 #define GSM_UNIX_SERIAL_H
 
+#include <cassert>
 #include <string>
 #include <gsmlib/gsm_error.h>
 #include <gsmlib/gsm_port.h>
--- gsmlib-1.10/gsmlib/gsm_map_key.h.orig	Wed May 15 04:38:12 2002
+++ gsmlib-1.10/gsmlib/gsm_map_key.h	Wed Aug 18 22:19:20 2004
@@ -25,6 +25,16 @@
 
   // wrapper for map key, can access Sortedtore to get sortOrder()
 
+  template <class SortedStore> class MapKey;
+  
+  // compare two keys
+  template <class SortedStore>
+    extern bool operator<(const MapKey<SortedStore> &x,
+                          const MapKey<SortedStore> &y);
+  template <class SortedStore>
+    extern bool operator==(const MapKey<SortedStore> &x,
+                           const MapKey<SortedStore> &y);
+  
   template <class SortedStore> class MapKey
   {
     SortedStore &_myStore;   // my store
@@ -61,14 +71,6 @@
                        const MapKey<SortedStore> &y);
   };
 
-  // compare two keys
-  template <class SortedStore>
-    extern bool operator<(const MapKey<SortedStore> &x,
-                          const MapKey<SortedStore> &y);
-  template <class SortedStore>
-    extern bool operator==(const MapKey<SortedStore> &x,
-                           const MapKey<SortedStore> &y);
-  
   // MapKey members
   
   template <class SortedStore>