diff --git a/indra/newview/fskeywords.cpp b/indra/newview/fskeywords.cpp
index f9e9ee3e97..f42e01a4ad 100644
--- a/indra/newview/fskeywords.cpp
+++ b/indra/newview/fskeywords.cpp
@@ -1,3 +1,28 @@
+/** 
+ * @file fskeywords.cpp
+ *
+ * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (C) 2011, The Phoenix Firestorm Project, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
 
 #include "llviewerprecompiledheaders.h"
 
diff --git a/indra/newview/fskeywords.h b/indra/newview/fskeywords.h
index 4c6e3eaf51..70502cf203 100644
--- a/indra/newview/fskeywords.h
+++ b/indra/newview/fskeywords.h
@@ -1,3 +1,29 @@
+/** 
+ * @file fskeywords.h
+ *
+ * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (C) 2011, The Phoenix Firestorm Project, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
+
 #ifndef FS_KEYWORDS_H
 #define FS_KEYWORDS_H
 
diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp
index d1bd5fd5df..c282f16df5 100644
--- a/indra/newview/fslslbridge.cpp
+++ b/indra/newview/fslslbridge.cpp
@@ -1,5 +1,5 @@
 /** 
- * @fslslbridge.cpp 
+ * @file fslslbridge.cpp 
  * @FSLSLBridge implementation 
  *
  * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$
diff --git a/indra/newview/fslslbridge.h b/indra/newview/fslslbridge.h
index b0d5ec534f..0285af5d2f 100644
--- a/indra/newview/fslslbridge.h
+++ b/indra/newview/fslslbridge.h
@@ -1,5 +1,5 @@
 /** 
- * @fslslbridge.h 
+ * @file fslslbridge.h 
  * @FSLSLBridge header 
  *
  * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$
diff --git a/indra/newview/fslslbridgerequest.cpp b/indra/newview/fslslbridgerequest.cpp
index c9542b5b6f..883d87d2a0 100644
--- a/indra/newview/fslslbridgerequest.cpp
+++ b/indra/newview/fslslbridgerequest.cpp
@@ -1,5 +1,5 @@
 /** 
- * @fslslbridgerequest.cpp
+ * @file fslslbridgerequest.cpp
  * @FSLSLBridgerequest implementation 
  *
  * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$
diff --git a/indra/newview/fslslbridgerequest.h b/indra/newview/fslslbridgerequest.h
index 1bdf7a2cdc..dad6509d77 100644
--- a/indra/newview/fslslbridgerequest.h
+++ b/indra/newview/fslslbridgerequest.h
@@ -1,5 +1,5 @@
 /** 
- * @fslslbridgerequest.h 
+ * @file fslslbridgerequest.h 
  * @FSLSLBridgerequest header 
  *
  * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$
diff --git a/indra/newview/fslslpreproc.cpp b/indra/newview/fslslpreproc.cpp
index 60a4be93f3..567f138a4f 100644
--- a/indra/newview/fslslpreproc.cpp
+++ b/indra/newview/fslslpreproc.cpp
@@ -1,4 +1,6 @@
-/* Copyright (c) 2010
+/**
+ * @file fslslpreproc.cpp
+ * Copyright (c) 2010
  *
  * Modular Systems All rights reserved.
  *
diff --git a/indra/newview/fslslpreproc.h b/indra/newview/fslslpreproc.h
index 371840a3c0..17bf9ffc93 100644
--- a/indra/newview/fslslpreproc.h
+++ b/indra/newview/fslslpreproc.h
@@ -1,4 +1,6 @@
-/* Copyright (c) 2010
+/**
+ * @file fslslpreproc.h
+ * Copyright (c) 2010
  *
  * Modular Systems All rights reserved.
  *
diff --git a/indra/newview/fsnearbychathub.cpp b/indra/newview/fsnearbychathub.cpp
index c59b870388..043d885b49 100644
--- a/indra/newview/fsnearbychathub.cpp
+++ b/indra/newview/fsnearbychathub.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file fsnearbychat.cpp
+ * @file fsnearbychathub.cpp (was llnearbychat.cpp)
  * @brief @brief Nearby chat central class for handling multiple chat input controls
  *
  * $LicenseInfo:firstyear=2009&license=viewerlgpl$
diff --git a/indra/newview/fsnearbychathub.h b/indra/newview/fsnearbychathub.h
index f900eafa15..571ee460c1 100644
--- a/indra/newview/fsnearbychathub.h
+++ b/indra/newview/fsnearbychathub.h
@@ -1,5 +1,5 @@
  /** 
- * @file llnearbychat.h
+ * @file fsnearbychathub.h (was llnearbychat.h)
  * @brief Nearby chat central class for handling multiple chat input controls
  *
  * $LicenseInfo:firstyear=2004&license=viewerlgpl$
diff --git a/indra/newview/fspanelprefs.cpp b/indra/newview/fspanelprefs.cpp
index e7657d73b3..d9e3c67e52 100644
--- a/indra/newview/fspanelprefs.cpp
+++ b/indra/newview/fspanelprefs.cpp
@@ -1,4 +1,29 @@
-/*${License blank}*/
+/** 
+ * @file fspanelprefs.h 
+ *
+ * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (C) 2011, The Phoenix Firestorm Project, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
+
 #include "llviewerprecompiledheaders.h"
 #include "fspanelprefs.h"
 #include "llcombobox.h"
diff --git a/indra/newview/fspanelprefs.h b/indra/newview/fspanelprefs.h
index b59edbd697..3e7cacbef2 100644
--- a/indra/newview/fspanelprefs.h
+++ b/indra/newview/fspanelprefs.h
@@ -1,4 +1,28 @@
-/*${License blank}*/
+/** 
+ * @file fspanelprefs.h 
+ *
+ * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (C) 2011, The Phoenix Firestorm Project, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
 
 #ifndef FS_PANELPREFS_H
 #define FS_PANELPREFS_H