16 files changed, 8 insertions, 28 deletions
diff --git a/protocols/AimOscar/src/aim.h b/protocols/AimOscar/src/aim.h
index e764ff3dc5..8ce9e5c64d 100644
--- a/protocols/AimOscar/src/aim.h
+++ b/protocols/AimOscar/src/aim.h
@@ -69,11 +69,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include <m_system_cpp.h>
 #include <m_imgsrvc.h>
 #include <win2k.h>
+#include <m_genmenu.h>
+#include <m_cluiframes.h>
+#include <m_extraicons.h>
 
-//independent includes
-#include "flap.h"
-#include "snac.h"
-#include "tlv.h"
+#include "m_folders.h"
+#include "m_assocmgr.h"
 
 //rest of includes
 #include "avatars.h"
@@ -82,7 +83,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "direct_connect.h"
 #include "conv.h"
 #include "file.h"
+#include "flap.h"
 #include "links.h"
+#include "snac.h"
+#include "tlv.h"
 #include "packets.h"
 #include "proxy.h"
 #include "resource.h"
diff --git a/protocols/AimOscar/src/avatars.cpp b/protocols/AimOscar/src/avatars.cpp
index 769c940cea..9eacdc6dad 100644
--- a/protocols/AimOscar/src/avatars.cpp
+++ b/protocols/AimOscar/src/avatars.cpp
@@ -17,9 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
-#include "avatars.h"
-
-#include "m_folders.h"
 
 void __cdecl CAimProto::avatar_request_thread(void* param)
 {
diff --git a/protocols/AimOscar/src/client.cpp b/protocols/AimOscar/src/client.cpp
index 37fe6c2734..ceb89c11dd 100644
--- a/protocols/AimOscar/src/client.cpp
+++ b/protocols/AimOscar/src/client.cpp
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
-#include "version.h"
 
 int CAimProto::aim_send_connection_packet(HANDLE hServerConn,unsigned short &seqno,char *buf)
 {
diff --git a/protocols/AimOscar/src/conv.cpp b/protocols/AimOscar/src/conv.cpp
index 41a0dd7099..f16a90cd84 100644
--- a/protocols/AimOscar/src/conv.cpp
+++ b/protocols/AimOscar/src/conv.cpp
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
-#include "conv.h"
 
 #ifdef _MSC_VER
 	#pragma warning( disable: 4706 )
diff --git a/protocols/AimOscar/src/file.cpp b/protocols/AimOscar/src/file.cpp
index 7af67727e8..14e453ef42 100644
--- a/protocols/AimOscar/src/file.cpp
+++ b/protocols/AimOscar/src/file.cpp
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
-#include "file.h"
 
 #pragma pack(push, 1)
 struct oft2//oscar file transfer 2 class- See On_Sending_Files_via_OSCAR.pdf
diff --git a/protocols/AimOscar/src/flap.cpp b/protocols/AimOscar/src/flap.cpp
index 8b9e08b372..9d5186da47 100644
--- a/protocols/AimOscar/src/flap.cpp
+++ b/protocols/AimOscar/src/flap.cpp
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
-#include "flap.h"
 
 FLAP::FLAP(char* buf,int num_bytes)
 {
diff --git a/protocols/AimOscar/src/links.cpp b/protocols/AimOscar/src/links.cpp
index c4eec4ae69..9c8766872f 100644
--- a/protocols/AimOscar/src/links.cpp
+++ b/protocols/AimOscar/src/links.cpp
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "aim.h"
-#include "links.h"
-#include "m_assocmgr.h"
 
 static HANDLE hServiceParseLink;
 
diff --git a/protocols/AimOscar/src/packets.cpp b/protocols/AimOscar/src/packets.cpp
index 91065138fa..3a4a5fc7f6 100644
--- a/protocols/AimOscar/src/packets.cpp
+++ b/protocols/AimOscar/src/packets.cpp
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
-#include "packets.h"
 
 int aim_writesnac(unsigned short service, unsigned short subgroup,unsigned short &offset, char* out, unsigned short id)
 {
diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp
index 45ca9a9694..db7b574e10 100644
--- a/protocols/AimOscar/src/proto.cpp
+++ b/protocols/AimOscar/src/proto.cpp
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
 
-#include "m_genmenu.h"
-
 CAimProto::CAimProto(const char* aProtoName, const TCHAR* aUserName)
 	: chat_rooms(5)
 {
diff --git a/protocols/AimOscar/src/proxy.cpp b/protocols/AimOscar/src/proxy.cpp
index b5ce8fef31..ee7927adc7 100644
--- a/protocols/AimOscar/src/proxy.cpp
+++ b/protocols/AimOscar/src/proxy.cpp
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
-#include "proxy.h"
 
 void __cdecl CAimProto::aim_proxy_helper(void* param)
 {
diff --git a/protocols/AimOscar/src/server.cpp b/protocols/AimOscar/src/server.cpp
index 9df0f81c7f..571878833d 100644
--- a/protocols/AimOscar/src/server.cpp
+++ b/protocols/AimOscar/src/server.cpp
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
-#include "version.h"
 
 void CAimProto::snac_md5_authkey(SNAC &snac,HANDLE hServerConn,unsigned short &seqno, const char* username, const char* password)//family 0x0017
 {
diff --git a/protocols/AimOscar/src/snac.cpp b/protocols/AimOscar/src/snac.cpp
index a9607b600b..8c893b58e0 100644
--- a/protocols/AimOscar/src/snac.cpp
+++ b/protocols/AimOscar/src/snac.cpp
@@ -17,8 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
-#include "snac.h"
-#include "packets.h"
 
 SNAC::SNAC(char* buf,unsigned short length)
 {
diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp
index 45bb443376..e34ac2d9b9 100644
--- a/protocols/AimOscar/src/theme.cpp
+++ b/protocols/AimOscar/src/theme.cpp
@@ -18,11 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
 
-#include <m_cluiframes.h>
-#include "m_extraicons.h"
-
-#include "theme.h"
-
 /////////////////////////////////////////////////////////////////////////////////////////
 // Icons init
 
diff --git a/protocols/AimOscar/src/tlv.cpp b/protocols/AimOscar/src/tlv.cpp
index 657e6af1a6..f35fbac50e 100644
--- a/protocols/AimOscar/src/tlv.cpp
+++ b/protocols/AimOscar/src/tlv.cpp
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aim.h"
-#include "tlv.h"
 
 TLV::TLV(char* buf)
 {
diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp
index 6e3f439f35..249a0cc573 100644
--- a/protocols/AimOscar/src/ui.cpp
+++ b/protocols/AimOscar/src/ui.cpp
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "aim.h"
-#include "ui.h"
 
 HANDLE hThemeButton = NULL;
 COLORREF foreground=0;
diff --git a/protocols/AimOscar/src/utility.cpp b/protocols/AimOscar/src/utility.cpp
index 4617fb7875..5ebf065227 100644
--- a/protocols/AimOscar/src/utility.cpp
+++ b/protocols/AimOscar/src/utility.cpp
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "aim.h"
-#include "utility.h"
 
 void CAimProto::broadcast_status(int status)
 {