diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index 7883e4cb89..f3c3c5ac52 100644
--- a/indra/newview/llconversationlog.cpp
+++ b/indra/newview/llconversationlog.cpp
@@ -25,6 +25,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#if 0
+
 #include "llagent.h"
 #include "llavatarnamecache.h"
 #include "llconversationlog.h"
@@ -613,3 +615,5 @@ void LLConversationLog::onClearLogResponse(const LLSD& notification, const LLSD&
 		deleteBackupLogs();
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h
index 265b1f0ef0..b33f2718eb 100644
--- a/indra/newview/llconversationlog.h
+++ b/indra/newview/llconversationlog.h
@@ -23,6 +23,8 @@
  * $/LicenseInfo$
  */
 
+#if 0
+
 #ifndef LLCONVERSATIONLOG_H_
 #define LLCONVERSATIONLOG_H_
 
@@ -214,3 +216,5 @@ public:
 };
 
 #endif /* LLCONVERSATIONLOG_H_ */
+
+#endif
\ No newline at end of file
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp
index 5ab108b39f..32a9bf1cde 100644
--- a/indra/newview/llconversationloglist.cpp
+++ b/indra/newview/llconversationloglist.cpp
@@ -25,6 +25,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#if 0
+
 #include "llavataractions.h"
 #include "llagent.h"
 #include "llfloaterreg.h"
@@ -531,3 +533,5 @@ bool LLConversationLogListDateComparator::doCompare(const LLConversationLogListI
 
 	return date1 > date2;
 }
+
+#endif
\ No newline at end of file
diff --git a/indra/newview/llconversationloglist.h b/indra/newview/llconversationloglist.h
index 62ec57e09e..edca9ff4e7 100644
--- a/indra/newview/llconversationloglist.h
+++ b/indra/newview/llconversationloglist.h
@@ -23,6 +23,8 @@
  * $/LicenseInfo$
  */
 
+if 0
+
 #ifndef LLCONVERSATIONLOGLIST_H_
 #define LLCONVERSATIONLOGLIST_H_
 
@@ -151,3 +153,5 @@ protected:
 };
 
 #endif /* LLCONVERSATIONLOGLIST_H_ */
+
+#endif
\ No newline at end of file
diff --git a/indra/newview/llconversationloglistitem.cpp b/indra/newview/llconversationloglistitem.cpp
index 4e984d603b..314dee4e46 100644
--- a/indra/newview/llconversationloglistitem.cpp
+++ b/indra/newview/llconversationloglistitem.cpp
@@ -25,6 +25,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#if 0
+
 // llui
 #include "lliconctrl.h"
 #include "lltextbox.h"
@@ -182,3 +184,5 @@ void LLConversationLogListItem::onDoubleClick()
 		break;
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index b6c53e5e30..d71a1f894b 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -27,6 +27,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#if 0
+
 #include "llconversationview.h"
 
 #include <boost/bind.hpp>
@@ -694,3 +696,4 @@ void LLConversationViewParticipant::hideSpeakingIndicator()
 
 // EOF
 
+#endif
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h
index 3eb2e63792..b3116edfb1 100644
--- a/indra/newview/llconversationview.h
+++ b/indra/newview/llconversationview.h
@@ -24,6 +24,8 @@
  * $/LicenseInfo$
  */
 
+#if 0
+
 #ifndef LL_LLCONVERSATIONVIEW_H
 #define LL_LLCONVERSATIONVIEW_H
 
@@ -175,3 +177,5 @@ private:
 };
 
 #endif // LL_LLCONVERSATIONVIEW_H
+
+#endif
\ No newline at end of file
diff --git a/indra/newview/llfloaterconversationlog.cpp b/indra/newview/llfloaterconversationlog.cpp
index 4c910c5655..cd0e0c6c30 100644
--- a/indra/newview/llfloaterconversationlog.cpp
+++ b/indra/newview/llfloaterconversationlog.cpp
@@ -25,6 +25,8 @@
  */
 #include "llviewerprecompiledheaders.h"
 
+#if 0
+
 #include "llconversationloglist.h"
 #include "llfiltereditor.h"
 #include "llfloaterconversationlog.h"
@@ -132,3 +134,4 @@ bool LLFloaterConversationLog::isActionChecked(const LLSD& userdata)
 	return false;
 }
 
+#endif
\ No newline at end of file
diff --git a/indra/newview/llfloaterconversationlog.h b/indra/newview/llfloaterconversationlog.h
index e971330f3d..3ea9ca7b78 100644
--- a/indra/newview/llfloaterconversationlog.h
+++ b/indra/newview/llfloaterconversationlog.h
@@ -23,6 +23,8 @@
  * $/LicenseInfo$
  */
 
+#if 0
+
 #ifndef LL_LLFLOATERCONVERSATIONLOG_H_
 #define LL_LLFLOATERCONVERSATIONLOG_H_
 
@@ -54,3 +56,5 @@ private:
 
 
 #endif /* LLFLOATERCONVERSATIONLOG_H_ */
+
+#endif
\ No newline at end of file
diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp
index a3d715530d..156c2c8c49 100644
--- a/indra/newview/llfloaterconversationpreview.cpp
+++ b/indra/newview/llfloaterconversationpreview.cpp
@@ -25,6 +25,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#if 0
+
 #include "llconversationlog.h"
 #include "llfloaterconversationpreview.h"
 #include "llimview.h"
@@ -184,3 +186,5 @@ void LLFloaterConversationPreview::onMoreHistoryBtnClick()
 
 	showHistory();
 }
+
+#endif
\ No newline at end of file
diff --git a/indra/newview/llfloaterconversationpreview.h b/indra/newview/llfloaterconversationpreview.h
index 1ea259478c..b9f5bc32f7 100644
--- a/indra/newview/llfloaterconversationpreview.h
+++ b/indra/newview/llfloaterconversationpreview.h
@@ -24,6 +24,8 @@
  */
 //<FS:TM> CHUI Merge this file doesnt exsist in LL's repo
 
+#if 0
+
 #ifndef LLFLOATERCONVERSATIONPREVIEW_H_
 #define LLFLOATERCONVERSATIONPREVIEW_H_
 
@@ -63,3 +65,5 @@ private:
 };
 
 #endif /* LLFLOATERCONVERSATIONPREVIEW_H_ */
+
+#endif
\ No newline at end of file
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 6b17ce30df..93461d8d4b 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -26,7 +26,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
-//#if 0 <FS:TM> CHUI Merge unmask this for now
+#if 0
+
 #include "message.h"
 
 #include "lliconctrl.h"
@@ -939,4 +940,5 @@ public:
 
 // Creating the object registers with the dispatcher.
 LLChatCommandHandler gChatHandler;
-//#endif
+
+#endif
diff --git a/indra/newview/llfloaterimnearbychat.h b/indra/newview/llfloaterimnearbychat.h
index 8a5d629c81..ccd4c6b499 100644
--- a/indra/newview/llfloaterimnearbychat.h
+++ b/indra/newview/llfloaterimnearbychat.h
@@ -24,7 +24,7 @@
  * $/LicenseInfo$
  */
 
-//#if 0  <FS:TM> CHUI Merge unmask this for now
+#if 0
 
 #ifndef LL_LLFLOATERIMNEARBYCHAT_H
 #define LL_LLFLOATERIMNEARBYCHAT_H
@@ -120,4 +120,4 @@ private:
 
 #endif // LL_LLFLOATERIMNEARBYCHAT_H
 
-//#endif
+#endif
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index ce6e639305..576369678d 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -27,6 +27,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#if 0
+
 #include "llfloaterimsessiontab.h"
 
 #include "llagent.h"
@@ -1101,3 +1103,5 @@ BOOL LLFloaterIMSessionTab::handleKeyHere(KEY key, MASK mask )
 	}
 	return TRUE;
 }
+
+#endif
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 302d5a8066..48e4096f37 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -25,6 +25,8 @@
  * $/LicenseInfo$
  */
 
+#if 0
+
 #ifndef LL_FLOATERIMSESSIONTAB_H
 #define LL_FLOATERIMSESSIONTAB_H
 
@@ -214,3 +216,5 @@ private:
 
 
 #endif /* LL_FLOATERIMSESSIONTAB_H */
+
+#endif