diff --git a/apps/dsm/DSMSession.h b/apps/dsm/DSMSession.h
index a7f2856c..a7475b2f 100644
--- a/apps/dsm/DSMSession.h
+++ b/apps/dsm/DSMSession.h
@@ -92,7 +92,7 @@ typedef map<string, string> VarMapT;
 typedef map<string, AmArg>  AVarMapT;
 
 class DSMDisposable;
-class AmPlaylistItem;
+struct AmPlaylistItem;
 
 class DSMSession {
 
diff --git a/apps/registrar_client/SIPRegistrarClient.h b/apps/registrar_client/SIPRegistrarClient.h
index 6b92cf26..14008bbd 100644
--- a/apps/registrar_client/SIPRegistrarClient.h
+++ b/apps/registrar_client/SIPRegistrarClient.h
@@ -155,7 +155,7 @@ class SIPRegistration : public AmSipDialogEventHandler,
   const string& getEventSink() { return sess_link; }
 };
 
-class SIPNewRegistrationEvent;
+struct SIPNewRegistrationEvent;
 class SIPRemoveRegistrationEvent;
 
 class SIPRegistrarClient  : public AmThread,
diff --git a/apps/voicemail/AmMail.h b/apps/voicemail/AmMail.h
index f84344b5..a5499ec4 100644
--- a/apps/voicemail/AmMail.h
+++ b/apps/voicemail/AmMail.h
@@ -59,7 +59,7 @@ struct Attachement
 
 typedef std::vector<Attachement> Attachements;
 
-class AmMail;
+struct AmMail;
 
 /**
  * Function pointer to be called after mail processing.
diff --git a/apps/voicemail/EmailTemplate.h b/apps/voicemail/EmailTemplate.h
index 346d87da..6c02e98b 100644
--- a/apps/voicemail/EmailTemplate.h
+++ b/apps/voicemail/EmailTemplate.h
@@ -32,7 +32,7 @@
 #include <string>
 using std::string;
 
-class AmMail;
+struct AmMail;
 
 typedef std::map<std::string,std::string> EmailTmplDict;