diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index c331326f1..727c431b7 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -33,51 +33,31 @@
 
 #include "llimpanel.h"
 
-#include "indra_constants.h"
-#include "llfocusmgr.h"
-#include "llfontgl.h"
-#include "llrect.h"
-#include "llerror.h"
-#include "llstring.h"
-#include "message.h"
-#include "lltextbox.h"
-#include "llnotificationsutil.h"
-
+#include "ascentkeyword.h"
 #include "llagent.h"
 #include "llavataractions.h"
+#include "llavatarnamecache.h"
 #include "llbutton.h"
 #include "llcombobox.h"
-#include "llcallingcard.h"
-#include "llchat.h"
-#include "llconsole.h"
-#include "llgroupactions.h"
 #include "llfloaterchat.h"
+#include "llfloaterinventory.h"
+#include "llgroupactions.h"
+#include "llhttpclient.h"
 #include "llimview.h"
 #include "llinventory.h"
 #include "llinventoryfunctions.h"
-#include "llfloaterinventory.h"
-#include "llcheckboxctrl.h"
-#include "llkeyboard.h"
 #include "lllineeditor.h"
-#include "llnotify.h"
+#include "llmutelist.h"
+#include "llnotificationsutil.h"
 #include "llparticipantlist.h"
-#include "llresmgr.h"
 #include "llspeakers.h"
+#include "llstylemap.h"
 #include "lltrans.h"
-#include "lltabcontainer.h"
-#include "llviewertexteditor.h"
-#include "llviewermessage.h"
-#include "llviewerstats.h"
-#include "llviewercontrol.h"
 #include "lluictrlfactory.h"
+#include "llviewertexteditor.h"
+#include "llviewerstats.h"
 #include "llviewerwindow.h"
 #include "llvoicechannel.h"
-#include "lllogchat.h"
-#include "llweb.h"
-#include "llhttpclient.h"
-#include "llmutelist.h"
-#include "llstylemap.h"
-#include "ascentkeyword.h"
 
 #include "boost/algorithm/string.hpp"
 
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
index be55641b1..fb5e3b3d0 100644
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -32,22 +32,19 @@
 #ifndef LL_IMPANEL_H
 #define LL_IMPANEL_H
 
-#include "llavatarnamecache.h"
 #include "llfloater.h"
 #include "lllogchat.h"
-#include "lluuid.h"
-#include "lldarray.h"
-#include "llinstantmessage.h"
-#include "llvoiceclient.h"
 #include "llstyle.h"
 
-class LLLineEditor;
-class LLViewerTextEditor;
-class LLInventoryItem;
-class LLInventoryCategory;
-class LLIMSpeakerMgr;
-class LLParticipantList;
+class LLAvatarName;
 class LLButton;
+class LLIMSpeakerMgr;
+class LLIMInfo;
+class LLInventoryCategory;
+class LLInventoryItem;
+class LLLineEditor;
+class LLParticipantList;
+class LLViewerTextEditor;
 class LLVoiceChannel;
 
 class LLFloaterIMPanel : public LLFloater
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index c04cd8348..8b0bd2adb 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -34,35 +34,25 @@
 
 #include "llimview.h"
 
-#include "llfontgl.h"
-#include "llrect.h"
-#include "llbutton.h"
 #include "llhttpclient.h"
+#include "llhttpnode.h"
+#include "llnotifications.h"
+#include "llnotificationsutil.h"
+#include "llsdserialize.h"
 #include "llsdutil_math.h"
-#include "llstring.h"
 #include "lltrans.h"
 #include "lluictrlfactory.h"
 
 #include "llagent.h"
 #include "llagentcamera.h"
 #include "llavataractions.h"
-#include "llcallingcard.h"
-#include "llchat.h"
-#include "llresmgr.h"
+#include "llavatarnamecache.h"
 #include "llfloaterchat.h"
 #include "llfloaterchatterbox.h"
-#include "llhttpnode.h"
 #include "llimpanel.h"
-#include "llnotificationsutil.h"
-#include "llsdserialize.h"
-#include "llspeakers.h"
-#include "lltabcontainer.h"
 #include "llmutelist.h"
-#include "llviewermenu.h"
-#include "llviewermessage.h"
-#include "llviewerwindow.h"
+#include "llspeakers.h"
 #include "llvoavatar.h" // For mIdleTimer reset
-#include "llnotify.h"
 #include "llviewerregion.h"
 
 // [RLVa:KB]
@@ -80,6 +70,7 @@ LLIMMgr* gIMMgr = NULL;
 //
 // Helper Functions
 //
+std::string formatted_time(const time_t& the_time);
 LLVOAvatar* find_avatar_from_object(const LLUUID& id);
 
 LLColor4 agent_chat_color(const LLUUID& id, const std::string& name, bool local_chat)