--- a/intercom/aec.h	Fri Jun 25 09:57:52 2010 +0200
+++ b/intercom/aec.h	Fri Jun 25 09:59:25 2010 +0200
@@ -303,7 +303,7 @@
  */
   float dtd(REAL d, REAL x);
 
-  void AEC::leaky();
+  void leaky();
   
 /* Normalized Least Mean Square Algorithm pre-whitening (NLMS-pw)
  * The LMS algorithm was developed by Bernard Widrow
@@ -327,24 +327,24 @@
  * in   x:  loudspeaker signal
  * return:  echo cancelled microphone signal
  */
-  int AEC::doAEC(int d_, int x_);
+  int doAEC(int d_, int x_);
 
-  float AEC::getambient() {
+  float getambient() {
     return dfast;
   };
-  void AEC::setambient(float Min_xf) {
+  void setambient(float Min_xf) {
     dotp_xf_xf -= delta;  // subtract old delta
     delta = (NLMS_LEN-1) * Min_xf * Min_xf;
     dotp_xf_xf += delta;  // add new delta
   };
-  void AEC::setgain(float gain_) {
+  void setgain(float gain_) {
     gain = gain_;
   };
-  void AEC::openwdisplay();
-  void AEC::setaes(float aes_y2_) {
+  void openwdisplay();
+  void setaes(float aes_y2_) {
     aes_y2 = aes_y2_;
   };
-  double AEC::max_dotp_xf_xf(double u);
+  double max_dotp_xf_xf(double u);
 };
 
 #define _AEC_H

--- a/intercom/cirbuf.h	Fri Jun 25 09:57:52 2010 +0200
+++ b/intercom/cirbuf.h	Fri Jun 25 09:59:25 2010 +0200
@@ -22,9 +22,9 @@
 
 public:
    CIRBUF();
-  void CIRBUF::init();
-  int CIRBUF::push(char *from, int size);
-  int CIRBUF::pop(char *to, int size);
+  void init();
+  int push(char *from, int size);
+  int pop(char *to, int size);
   int getlen() {
     return len;
   }

--- a/intercom/intercomd.cpp	Fri Jun 25 09:57:52 2010 +0200
+++ b/intercom/intercomd.cpp	Fri Jun 25 09:59:25 2010 +0200
@@ -89,19 +89,19 @@
 /* EFR stubs - because of function name conflict in EFR and G.729 */
 class EFR {
 public:
-  int EFR::initEncode(int dtx_mode_) {
+  int initEncode(int dtx_mode_) {
     return 0;
   };
-  int EFR::encode(              /* (o) len in byte of encoded_data */
+  int encode(              /* (o) len in byte of encoded_data */
     Byte * encoded_data,        /* (o) The encoded bytes */
     Word16 * data               /* (i) The signal block to encode */
     ) {
     return 0;
   };
-  int EFR::initDecode() {
+  int initDecode() {
     return 0;
   };
-  int EFR::decode(              /* (o) Number of decoded samples or 0 for error */
+  int decode(              /* (o) Number of decoded samples or 0 for error */
     Word16 * decoded_data,      /* (o) Decoded signal block */
     Byte * encoded_data,        /* (i) Encoded bytes */
     Word16 mode                 /* (i) 0=PL, 1=Normal */
@@ -119,21 +119,21 @@
 /* G.729 stubs - because of function name conflict in EFR and G.729 */
 class G729 {
 public:
-  int G729::initEncode(int dummy) {
+  int initEncode(int dummy) {
     return 0;
   };
 
-  int G729::encode(             /* len in byte of encoded_data */
+  int encode(             /* len in byte of encoded_data */
     Byte * encoded_data,        /* (o) The encoded bytes */
     Word16 * data               /* (i) The signal block to encode */
     ) {
     return 0;
   };
-  int G729::initDecode() {
+  int initDecode() {
     return 0;
   };
 
-  int G729::decode(             /* (o) Number of decoded samples */
+  int decode(             /* (o) Number of decoded samples */
     Word16 * decoded_data,      /* (o) Decoded signal block */
     Byte * encoded_data,        /* (i) Encoded bytes */
     Word16 mode                 /* (i) 0=PL, 1=Normal */

--- a/intercom/rtp.h	Fri Jun 25 09:57:52 2010 +0200
+++ b/intercom/rtp.h	Fri Jun 25 09:59:25 2010 +0200
@@ -34,20 +34,20 @@
   unsigned long csrc[15];
 
 public:
-   RTP::RTP();
-  void RTP::init(int payload_type_, unsigned long ssrc_);
-  int RTP::add_csrc(unsigned long csrc_);
-  void RTP::reset_csrc();
-  int RTP::find_csrc(unsigned long ssrc_);
-  void RTP::next(int frameduration);
-  int RTP::check();
-  unsigned long RTP::getssrc() {
+   RTP();
+  void init(int payload_type_, unsigned long ssrc_);
+  int add_csrc(unsigned long csrc_);
+  void reset_csrc();
+  int find_csrc(unsigned long ssrc_);
+  void next(int frameduration);
+  int check();
+  unsigned long getssrc() {
     return ssrc;
   };
-  int RTP::get_pt() {
+  int get_pt() {
     return (int) payload_type;
   };
-  int RTP::get_cc() {
+  int get_cc() {
     return (int) csrc_count;
   }
 };

--- a/intercom/sinuston.h	Fri Jun 25 09:57:52 2010 +0200
+++ b/intercom/sinuston.h	Fri Jun 25 09:59:25 2010 +0200
@@ -22,14 +22,14 @@
  * out-Parameter: returnvalue --> -1 im Fehlerfall, sonst
  *                                Anzahl Elemente in Sinustabelle
  */
-short SINUSTON::frequenz(int f1, int fs, float pegel);
+short frequenz(int f1, int fs, float pegel);
 
 
 
 /* in-Parameter: ein_sprache --> Eingangs Sprach sample
  * out-Parameter: returnvalue --> Sprachsample mit Sinuston
  */
-short SINUSTON::mischen(short ein_sprache);
+short mischen(short ein_sprache);
 };
 
 #endif