4 files changed, 1 insertions, 17 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index 923bc7a3a1..42ed7603d1 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -29,7 +29,6 @@
 
 #include "llconversationmodel.h"
 #include "llimconversation.h"
-#include "llimfloatercontainer.h"
 
 // Conversation items
 LLConversationItem::LLConversationItem(std::string display_name, const LLUUID& uuid, LLFolderViewModelInterface& root_view_model) :
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index 2f7124aec5..1ce70d754b 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -27,19 +27,9 @@
 #ifndef LL_LLCONVERSATIONMODEL_H
 #define LL_LLCONVERSATIONMODEL_H
 
-//#include <map>
-//#include <vector>
-
 #include "llfolderviewitem.h"
 #include "llfolderviewmodel.h"
 
-class LLButton;
-class LLFloater;
-class LLLayoutPanel;
-class LLLayoutStack;
-class LLTabContainer;
-class LLIMFloaterContainer;
-
 // Implementation of conversations list
 
 class LLConversationItem;
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 7d90a154e5..464d061a82 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -28,6 +28,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llconversationview.h"
+#include "llconversationmodel.h"
 #include "llimconversation.h"
 #include "llimfloatercontainer.h"
 
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h
index 08f2343aca..743efb6384 100644
--- a/indra/newview/llconversationview.h
+++ b/indra/newview/llconversationview.h
@@ -28,13 +28,7 @@
 #define LL_LLCONVERSATIONVIEW_H
 
 #include "llfolderviewitem.h"
-#include "llfolderviewmodel.h"
 
-class LLButton;
-class LLFloater;
-class LLLayoutPanel;
-class LLLayoutStack;
-class LLTabContainer;
 class LLIMFloaterContainer;
 
 // Implementation of conversations list widgets