77 files changed, 92 insertions, 88 deletions
diff --git a/protocols/Yahoo/yahoo-translation.txt b/protocols/Yahoo/Docs/yahoo-translation.txt
index f4615d6a07..f4615d6a07 100644
--- a/protocols/Yahoo/yahoo-translation.txt
+++ b/protocols/Yahoo/Docs/yahoo-translation.txt
diff --git a/protocols/Yahoo/Yahoo_10.vcxproj b/protocols/Yahoo/Yahoo_10.vcxproj
index 31e91116eb..e4bdfc36f0 100644
--- a/protocols/Yahoo/Yahoo_10.vcxproj
+++ b/protocols/Yahoo/Yahoo_10.vcxproj
@@ -191,59 +191,60 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="avatar.cpp" />
-    <ClCompile Include="chat.cpp" />
-    <ClCompile Include="file_transfer.cpp" />
-    <ClCompile Include="http_gateway.cpp" />
-    <ClCompile Include="icolib.cpp" />
-    <ClCompile Include="ignore.cpp" />
-    <ClCompile Include="im.cpp" />
-    <ClCompile Include="links.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="proto.cpp" />
-    <ClCompile Include="search.cpp" />
-    <ClCompile Include="server.cpp" />
-    <ClCompile Include="services.cpp" />
-    <ClCompile Include="user_info.cpp" />
-    <ClCompile Include="util.cpp" />
-    <ClCompile Include="webcam.cpp" />
-    <ClCompile Include="yahoo.cpp">
+    <ClCompile Include="src\avatar.cpp" />
+    <ClCompile Include="src\chat.cpp" />
+    <ClCompile Include="src\file_transfer.cpp" />
+    <ClCompile Include="src\http_gateway.cpp" />
+    <ClCompile Include="src\icolib.cpp" />
+    <ClCompile Include="src\ignore.cpp" />
+    <ClCompile Include="src\im.cpp" />
+    <ClCompile Include="src\links.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\proto.cpp" />
+    <ClCompile Include="src\search.cpp" />
+    <ClCompile Include="src\server.cpp" />
+    <ClCompile Include="src\services.cpp" />
+    <ClCompile Include="src\user_info.cpp" />
+    <ClCompile Include="src\util.cpp" />
+    <ClCompile Include="src\webcam.cpp" />
+    <ClCompile Include="src\yahoo.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="libyahoo2\crypt.c">
+    <ClCompile Include="src\libyahoo2\crypt.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="libyahoo2\libyahoo2.c">
+    <ClCompile Include="src\libyahoo2\libyahoo2.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="libyahoo2\yahoo_httplib.c">
+    <ClCompile Include="src\libyahoo2\yahoo_httplib.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="libyahoo2\yahoo_list.c">
+    <ClCompile Include="src\libyahoo2\yahoo_list.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="libyahoo2\yahoo_util.c">
+    <ClCompile Include="src\libyahoo2\yahoo_util.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="libyahoo2\config.h" />
-    <ClInclude Include="libyahoo2\yahoo2.h" />
-    <ClInclude Include="libyahoo2\yahoo2_callbacks.h" />
-    <ClInclude Include="libyahoo2\yahoo2_types.h" />
-    <ClInclude Include="libyahoo2\yahoo_debug.h" />
-    <ClInclude Include="libyahoo2\yahoo_httplib.h" />
-    <ClInclude Include="libyahoo2\yahoo_list.h" />
-    <ClInclude Include="libyahoo2\yahoo_util.h" />
-    <ClInclude Include="http_gateway.h" />
-    <ClInclude Include="ignore.h" />
-    <ClInclude Include="proto.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="yahoo.h" />
+    <ClInclude Include="src\libyahoo2\config.h" />
+    <ClInclude Include="src\libyahoo2\yahoo2.h" />
+    <ClInclude Include="src\libyahoo2\yahoo2_callbacks.h" />
+    <ClInclude Include="src\libyahoo2\yahoo2_types.h" />
+    <ClInclude Include="src\libyahoo2\yahoo_debug.h" />
+    <ClInclude Include="src\libyahoo2\yahoo_httplib.h" />
+    <ClInclude Include="src\libyahoo2\yahoo_list.h" />
+    <ClInclude Include="src\libyahoo2\yahoo_util.h" />
+    <ClInclude Include="src\http_gateway.h" />
+    <ClInclude Include="src\ignore.h" />
+    <ClInclude Include="src\proto.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\yahoo.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Yahoo.rc" />
+    <ResourceCompile Include="res\Yahoo.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/protocols/Yahoo/Yahoo_10.vcxproj.filters b/protocols/Yahoo/Yahoo_10.vcxproj.filters
index 9df62075f8..27ba01ff18 100644
--- a/protocols/Yahoo/Yahoo_10.vcxproj.filters
+++ b/protocols/Yahoo/Yahoo_10.vcxproj.filters
@@ -18,119 +18,122 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="avatar.cpp">
+    <ClCompile Include="src\avatar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="chat.cpp">
+    <ClCompile Include="src\chat.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="file_transfer.cpp">
+    <ClCompile Include="src\file_transfer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="http_gateway.cpp">
+    <ClCompile Include="src\http_gateway.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="icolib.cpp">
+    <ClCompile Include="src\icolib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ignore.cpp">
+    <ClCompile Include="src\ignore.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="im.cpp">
+    <ClCompile Include="src\im.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="proto.cpp">
+    <ClCompile Include="src\proto.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="search.cpp">
+    <ClCompile Include="src\search.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="server.cpp">
+    <ClCompile Include="src\server.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="services.cpp">
+    <ClCompile Include="src\services.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="user_info.cpp">
+    <ClCompile Include="src\user_info.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util.cpp">
+    <ClCompile Include="src\util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="webcam.cpp">
+    <ClCompile Include="src\webcam.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="yahoo.cpp">
+    <ClCompile Include="src\yahoo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="libyahoo2\crypt.c">
+    <ClCompile Include="src\libyahoo2\crypt.c">
       <Filter>Source Files\libyahoo2</Filter>
     </ClCompile>
-    <ClCompile Include="libyahoo2\libyahoo2.c">
+    <ClCompile Include="src\libyahoo2\libyahoo2.c">
       <Filter>Source Files\libyahoo2</Filter>
     </ClCompile>
-    <ClCompile Include="libyahoo2\yahoo_httplib.c">
+    <ClCompile Include="src\libyahoo2\yahoo_httplib.c">
       <Filter>Source Files\libyahoo2</Filter>
     </ClCompile>
-    <ClCompile Include="libyahoo2\yahoo_list.c">
+    <ClCompile Include="src\libyahoo2\yahoo_list.c">
       <Filter>Source Files\libyahoo2</Filter>
     </ClCompile>
-    <ClCompile Include="libyahoo2\yahoo_util.c">
+    <ClCompile Include="src\libyahoo2\yahoo_util.c">
       <Filter>Source Files\libyahoo2</Filter>
     </ClCompile>
-    <ClCompile Include="links.cpp">
+    <ClCompile Include="src\links.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="libyahoo2\config.h">
+    <ClInclude Include="src\libyahoo2\config.h">
       <Filter>Source Files\libyahoo2</Filter>
     </ClInclude>
-    <ClInclude Include="libyahoo2\yahoo2.h">
+    <ClInclude Include="src\libyahoo2\yahoo2.h">
       <Filter>Source Files\libyahoo2</Filter>
     </ClInclude>
-    <ClInclude Include="libyahoo2\yahoo2_callbacks.h">
+    <ClInclude Include="src\libyahoo2\yahoo2_callbacks.h">
       <Filter>Source Files\libyahoo2</Filter>
     </ClInclude>
-    <ClInclude Include="libyahoo2\yahoo2_types.h">
+    <ClInclude Include="src\libyahoo2\yahoo2_types.h">
       <Filter>Source Files\libyahoo2</Filter>
     </ClInclude>
-    <ClInclude Include="libyahoo2\yahoo_debug.h">
+    <ClInclude Include="src\libyahoo2\yahoo_debug.h">
       <Filter>Source Files\libyahoo2</Filter>
     </ClInclude>
-    <ClInclude Include="libyahoo2\yahoo_httplib.h">
+    <ClInclude Include="src\libyahoo2\yahoo_httplib.h">
       <Filter>Source Files\libyahoo2</Filter>
     </ClInclude>
-    <ClInclude Include="libyahoo2\yahoo_list.h">
+    <ClInclude Include="src\libyahoo2\yahoo_list.h">
       <Filter>Source Files\libyahoo2</Filter>
     </ClInclude>
-    <ClInclude Include="libyahoo2\yahoo_util.h">
+    <ClInclude Include="src\libyahoo2\yahoo_util.h">
       <Filter>Source Files\libyahoo2</Filter>
     </ClInclude>
-    <ClInclude Include="http_gateway.h">
+    <ClInclude Include="src\http_gateway.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ignore.h">
+    <ClInclude Include="src\ignore.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="proto.h">
+    <ClInclude Include="src\proto.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="yahoo.h">
+    <ClInclude Include="src\yahoo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Yahoo.rc">
+    <ResourceCompile Include="res\Yahoo.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="res\version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/protocols/Yahoo/proto_yahoo/Proto_Yahoo.vcxproj b/protocols/Yahoo/proto_yahoo/Proto_Yahoo.vcxproj
index 5ce16e3a7d..7cd443371d 100644
--- a/protocols/Yahoo/proto_yahoo/Proto_Yahoo.vcxproj
+++ b/protocols/Yahoo/proto_yahoo/Proto_Yahoo.vcxproj
@@ -119,10 +119,10 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Proto_Yahoo.rc" />
+    <ResourceCompile Include="res\Proto_Yahoo.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/protocols/Yahoo/proto_yahoo/Proto_Yahoo.vcxproj.filters b/protocols/Yahoo/proto_yahoo/Proto_Yahoo.vcxproj.filters
index ebfcf02beb..57344450d0 100644
--- a/protocols/Yahoo/proto_yahoo/Proto_Yahoo.vcxproj.filters
+++ b/protocols/Yahoo/proto_yahoo/Proto_Yahoo.vcxproj.filters
@@ -11,12 +11,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Proto_Yahoo.rc">
+    <ResourceCompile Include="res\Proto_Yahoo.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/protocols/Yahoo/proto_yahoo/icos/Away.ico b/protocols/Yahoo/proto_yahoo/res/Away.ico
index e3eb13d0ca..e3eb13d0ca 100644
--- a/protocols/Yahoo/proto_yahoo/icos/Away.ico
+++ b/protocols/Yahoo/proto_yahoo/res/Away.ico
diff --git a/protocols/Yahoo/proto_yahoo/icos/DND.ico b/protocols/Yahoo/proto_yahoo/res/DND.ico
index 9293111894..9293111894 100644
--- a/protocols/Yahoo/proto_yahoo/icos/DND.ico
+++ b/protocols/Yahoo/proto_yahoo/res/DND.ico
diff --git a/protocols/Yahoo/proto_yahoo/icos/Invisible.ico b/protocols/Yahoo/proto_yahoo/res/Invisible.ico
index 0433f80e2f..0433f80e2f 100644
--- a/protocols/Yahoo/proto_yahoo/icos/Invisible.ico
+++ b/protocols/Yahoo/proto_yahoo/res/Invisible.ico
diff --git a/protocols/Yahoo/proto_yahoo/icos/Lunch.ico b/protocols/Yahoo/proto_yahoo/res/Lunch.ico
index 91868389c9..91868389c9 100644
--- a/protocols/Yahoo/proto_yahoo/icos/Lunch.ico
+++ b/protocols/Yahoo/proto_yahoo/res/Lunch.ico
diff --git a/protocols/Yahoo/proto_yahoo/icos/NA.ico b/protocols/Yahoo/proto_yahoo/res/NA.ico
index 848466bf33..848466bf33 100644
--- a/protocols/Yahoo/proto_yahoo/icos/NA.ico
+++ b/protocols/Yahoo/proto_yahoo/res/NA.ico
diff --git a/protocols/Yahoo/proto_yahoo/icos/Occupied.ico b/protocols/Yahoo/proto_yahoo/res/Occupied.ico
index 5a57e27fda..5a57e27fda 100644
--- a/protocols/Yahoo/proto_yahoo/icos/Occupied.ico
+++ b/protocols/Yahoo/proto_yahoo/res/Occupied.ico
diff --git a/protocols/Yahoo/proto_yahoo/icos/Offline.ico b/protocols/Yahoo/proto_yahoo/res/Offline.ico
index c2a67ca6b6..c2a67ca6b6 100644
--- a/protocols/Yahoo/proto_yahoo/icos/Offline.ico
+++ b/protocols/Yahoo/proto_yahoo/res/Offline.ico
diff --git a/protocols/Yahoo/proto_yahoo/icos/Online.ico b/protocols/Yahoo/proto_yahoo/res/Online.ico
index 61c3f6a143..61c3f6a143 100644
--- a/protocols/Yahoo/proto_yahoo/icos/Online.ico
+++ b/protocols/Yahoo/proto_yahoo/res/Online.ico
diff --git a/protocols/Yahoo/proto_yahoo/icos/Phone.ico b/protocols/Yahoo/proto_yahoo/res/Phone.ico
index 3688089d10..3688089d10 100644
--- a/protocols/Yahoo/proto_yahoo/icos/Phone.ico
+++ b/protocols/Yahoo/proto_yahoo/res/Phone.ico
diff --git a/protocols/Yahoo/proto_yahoo/Proto_Yahoo.rc b/protocols/Yahoo/proto_yahoo/res/Proto_Yahoo.rc
index 849036ddd4..42febe1f96 100644
--- a/protocols/Yahoo/proto_yahoo/Proto_Yahoo.rc
+++ b/protocols/Yahoo/proto_yahoo/res/Proto_Yahoo.rc
diff --git a/protocols/Yahoo/proto_yahoo/resource.h b/protocols/Yahoo/proto_yahoo/src/resource.h
index b8b3a0451c..b8b3a0451c 100644
--- a/protocols/Yahoo/proto_yahoo/resource.h
+++ b/protocols/Yahoo/proto_yahoo/src/resource.h
diff --git a/protocols/Yahoo/Yahoo.rc b/protocols/Yahoo/res/Yahoo.rc
index 106dde33a1..dd8d7da5a2 100644
--- a/protocols/Yahoo/Yahoo.rc
+++ b/protocols/Yahoo/res/Yahoo.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "winres.h"
-#include "resource.h"
+#include "..\src\resource.h"
 /////////////////////////////////////////////////////////////////////////////
 // English (United States) resources
 
@@ -157,13 +157,13 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_YAHOO               ICON                    "icos/yahoo.ico"
-IDI_INBOX               ICON                    "icos/inbox.ico"
-IDI_PROFILE             ICON                    "icos/profile.ico"
-IDI_REFRESH             ICON                    "icos/refresh.ico"
-IDI_YAB                 ICON                    "icos/address_book.ico"
-IDI_SET_STATUS          ICON                    "icos/set_status.ico"
-IDI_CALENDAR            ICON                    "icos/calendar.ico"
+IDI_YAHOO               ICON                    "yahoo.ico"
+IDI_INBOX               ICON                    "inbox.ico"
+IDI_PROFILE             ICON                    "profile.ico"
+IDI_REFRESH             ICON                    "refresh.ico"
+IDI_YAB                 ICON                    "address_book.ico"
+IDI_SET_STATUS          ICON                    "set_status.ico"
+IDI_CALENDAR            ICON                    "calendar.ico"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -173,7 +173,7 @@ IDI_CALENDAR            ICON                    "icos/calendar.ico"
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/protocols/Yahoo/icos/address_book.ico b/protocols/Yahoo/res/address_book.ico
index ce04d3bbc2..ce04d3bbc2 100644
--- a/protocols/Yahoo/icos/address_book.ico
+++ b/protocols/Yahoo/res/address_book.ico
diff --git a/protocols/Yahoo/icos/calendar.ico b/protocols/Yahoo/res/calendar.ico
index 031e45de03..031e45de03 100644
--- a/protocols/Yahoo/icos/calendar.ico
+++ b/protocols/Yahoo/res/calendar.ico
diff --git a/protocols/Yahoo/icos/inbox.ico b/protocols/Yahoo/res/inbox.ico
index e101d8550e..e101d8550e 100644
--- a/protocols/Yahoo/icos/inbox.ico
+++ b/protocols/Yahoo/res/inbox.ico
diff --git a/protocols/Yahoo/icos/invite.ico b/protocols/Yahoo/res/invite.ico
index 94c37db75e..94c37db75e 100644
--- a/protocols/Yahoo/icos/invite.ico
+++ b/protocols/Yahoo/res/invite.ico
diff --git a/protocols/Yahoo/icos/profile.ico b/protocols/Yahoo/res/profile.ico
index 715b7a1bec..715b7a1bec 100644
--- a/protocols/Yahoo/icos/profile.ico
+++ b/protocols/Yahoo/res/profile.ico
diff --git a/protocols/Yahoo/icos/refresh.ico b/protocols/Yahoo/res/refresh.ico
index 3eba98d2b3..3eba98d2b3 100644
--- a/protocols/Yahoo/icos/refresh.ico
+++ b/protocols/Yahoo/res/refresh.ico
diff --git a/protocols/Yahoo/icos/set_status.ico b/protocols/Yahoo/res/set_status.ico
index 988091f1bf..988091f1bf 100644
--- a/protocols/Yahoo/icos/set_status.ico
+++ b/protocols/Yahoo/res/set_status.ico
diff --git a/protocols/Yahoo/version.rc b/protocols/Yahoo/res/version.rc
index 813bec8dd1..de48098be2 100644
--- a/protocols/Yahoo/version.rc
+++ b/protocols/Yahoo/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include <windows.h>
-#include "version.h"
+#include "..\src\version.h"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION __FILEVERSION_STRING
diff --git a/protocols/Yahoo/icos/yahoo.ico b/protocols/Yahoo/res/yahoo.ico
index 2713d70e0d..2713d70e0d 100644
--- a/protocols/Yahoo/icos/yahoo.ico
+++ b/protocols/Yahoo/res/yahoo.ico
diff --git a/protocols/Yahoo/avatar.cpp b/protocols/Yahoo/src/avatar.cpp
index c35707203d..c35707203d 100644
--- a/protocols/Yahoo/avatar.cpp
+++ b/protocols/Yahoo/src/avatar.cpp
diff --git a/protocols/Yahoo/avatar.h b/protocols/Yahoo/src/avatar.h
index 57bf6e6e8f..57bf6e6e8f 100644
--- a/protocols/Yahoo/avatar.h
+++ b/protocols/Yahoo/src/avatar.h
diff --git a/protocols/Yahoo/chat.cpp b/protocols/Yahoo/src/chat.cpp
index 4477e5a0d9..4477e5a0d9 100644
--- a/protocols/Yahoo/chat.cpp
+++ b/protocols/Yahoo/src/chat.cpp
diff --git a/protocols/Yahoo/chat.h b/protocols/Yahoo/src/chat.h
index c56fa435c7..c56fa435c7 100644
--- a/protocols/Yahoo/chat.h
+++ b/protocols/Yahoo/src/chat.h
diff --git a/protocols/Yahoo/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp
index be896a4363..be896a4363 100644
--- a/protocols/Yahoo/file_transfer.cpp
+++ b/protocols/Yahoo/src/file_transfer.cpp
diff --git a/protocols/Yahoo/file_transfer.h b/protocols/Yahoo/src/file_transfer.h
index f33d7cd046..f33d7cd046 100644
--- a/protocols/Yahoo/file_transfer.h
+++ b/protocols/Yahoo/src/file_transfer.h
diff --git a/protocols/Yahoo/http_gateway.cpp b/protocols/Yahoo/src/http_gateway.cpp
index e62219f108..e62219f108 100644
--- a/protocols/Yahoo/http_gateway.cpp
+++ b/protocols/Yahoo/src/http_gateway.cpp
diff --git a/protocols/Yahoo/http_gateway.h b/protocols/Yahoo/src/http_gateway.h
index 43aa4c1809..43aa4c1809 100644
--- a/protocols/Yahoo/http_gateway.h
+++ b/protocols/Yahoo/src/http_gateway.h
diff --git a/protocols/Yahoo/icolib.cpp b/protocols/Yahoo/src/icolib.cpp
index 09ad4853b0..09ad4853b0 100644
--- a/protocols/Yahoo/icolib.cpp
+++ b/protocols/Yahoo/src/icolib.cpp
diff --git a/protocols/Yahoo/ignore.cpp b/protocols/Yahoo/src/ignore.cpp
index 3a0a6f2cdb..3a0a6f2cdb 100644
--- a/protocols/Yahoo/ignore.cpp
+++ b/protocols/Yahoo/src/ignore.cpp
diff --git a/protocols/Yahoo/ignore.h b/protocols/Yahoo/src/ignore.h
index e8d3ede800..e8d3ede800 100644
--- a/protocols/Yahoo/ignore.h
+++ b/protocols/Yahoo/src/ignore.h
diff --git a/protocols/Yahoo/im.cpp b/protocols/Yahoo/src/im.cpp
index 5e28ec9d5f..5e28ec9d5f 100644
--- a/protocols/Yahoo/im.cpp
+++ b/protocols/Yahoo/src/im.cpp
diff --git a/protocols/Yahoo/im.h b/protocols/Yahoo/src/im.h
index 4fa6be16c8..4fa6be16c8 100644
--- a/protocols/Yahoo/im.h
+++ b/protocols/Yahoo/src/im.h
diff --git a/protocols/Yahoo/libyahoo2/Docs/AUTHORS b/protocols/Yahoo/src/libyahoo2/Docs/AUTHORS
index 2cc592900c..2cc592900c 100644
--- a/protocols/Yahoo/libyahoo2/Docs/AUTHORS
+++ b/protocols/Yahoo/src/libyahoo2/Docs/AUTHORS
diff --git a/protocols/Yahoo/libyahoo2/Docs/COPYING b/protocols/Yahoo/src/libyahoo2/Docs/COPYING
index fbdd65f6f8..fbdd65f6f8 100644
--- a/protocols/Yahoo/libyahoo2/Docs/COPYING
+++ b/protocols/Yahoo/src/libyahoo2/Docs/COPYING
diff --git a/protocols/Yahoo/libyahoo2/Docs/ChangeLog b/protocols/Yahoo/src/libyahoo2/Docs/ChangeLog
index ecf16131c5..ecf16131c5 100644
--- a/protocols/Yahoo/libyahoo2/Docs/ChangeLog
+++ b/protocols/Yahoo/src/libyahoo2/Docs/ChangeLog
diff --git a/protocols/Yahoo/libyahoo2/Docs/NEWS b/protocols/Yahoo/src/libyahoo2/Docs/NEWS
index e4021883a1..e4021883a1 100644
--- a/protocols/Yahoo/libyahoo2/Docs/NEWS
+++ b/protocols/Yahoo/src/libyahoo2/Docs/NEWS
diff --git a/protocols/Yahoo/libyahoo2/Docs/README b/protocols/Yahoo/src/libyahoo2/Docs/README
index 281de5c7c3..281de5c7c3 100644
--- a/protocols/Yahoo/libyahoo2/Docs/README
+++ b/protocols/Yahoo/src/libyahoo2/Docs/README
diff --git a/protocols/Yahoo/libyahoo2/Docs/TODO b/protocols/Yahoo/src/libyahoo2/Docs/TODO
index f005ec9bf2..f005ec9bf2 100644
--- a/protocols/Yahoo/libyahoo2/Docs/TODO
+++ b/protocols/Yahoo/src/libyahoo2/Docs/TODO
diff --git a/protocols/Yahoo/libyahoo2/Docs/ymsg-9.txt b/protocols/Yahoo/src/libyahoo2/Docs/ymsg-9.txt
index d017013d7d..d017013d7d 100644
--- a/protocols/Yahoo/libyahoo2/Docs/ymsg-9.txt
+++ b/protocols/Yahoo/src/libyahoo2/Docs/ymsg-9.txt
diff --git a/protocols/Yahoo/libyahoo2/config.h b/protocols/Yahoo/src/libyahoo2/config.h
index 53ef7ca7cf..53ef7ca7cf 100644
--- a/protocols/Yahoo/libyahoo2/config.h
+++ b/protocols/Yahoo/src/libyahoo2/config.h
diff --git a/protocols/Yahoo/libyahoo2/crypt.c b/protocols/Yahoo/src/libyahoo2/crypt.c
index d8c50a08f6..d8c50a08f6 100644
--- a/protocols/Yahoo/libyahoo2/crypt.c
+++ b/protocols/Yahoo/src/libyahoo2/crypt.c
diff --git a/protocols/Yahoo/libyahoo2/libyahoo2.c b/protocols/Yahoo/src/libyahoo2/libyahoo2.c
index f51475a5ca..f51475a5ca 100644
--- a/protocols/Yahoo/libyahoo2/libyahoo2.c
+++ b/protocols/Yahoo/src/libyahoo2/libyahoo2.c
diff --git a/protocols/Yahoo/libyahoo2/yahoo2.h b/protocols/Yahoo/src/libyahoo2/yahoo2.h
index 475d82b6c3..475d82b6c3 100644
--- a/protocols/Yahoo/libyahoo2/yahoo2.h
+++ b/protocols/Yahoo/src/libyahoo2/yahoo2.h
diff --git a/protocols/Yahoo/libyahoo2/yahoo2_callbacks.h b/protocols/Yahoo/src/libyahoo2/yahoo2_callbacks.h
index b6a01346cb..b6a01346cb 100644
--- a/protocols/Yahoo/libyahoo2/yahoo2_callbacks.h
+++ b/protocols/Yahoo/src/libyahoo2/yahoo2_callbacks.h
diff --git a/protocols/Yahoo/libyahoo2/yahoo2_types.h b/protocols/Yahoo/src/libyahoo2/yahoo2_types.h
index e0bcf9498c..e0bcf9498c 100644
--- a/protocols/Yahoo/libyahoo2/yahoo2_types.h
+++ b/protocols/Yahoo/src/libyahoo2/yahoo2_types.h
diff --git a/protocols/Yahoo/libyahoo2/yahoo_debug.h b/protocols/Yahoo/src/libyahoo2/yahoo_debug.h
index b9d048b53d..b9d048b53d 100644
--- a/protocols/Yahoo/libyahoo2/yahoo_debug.h
+++ b/protocols/Yahoo/src/libyahoo2/yahoo_debug.h
diff --git a/protocols/Yahoo/libyahoo2/yahoo_httplib.c b/protocols/Yahoo/src/libyahoo2/yahoo_httplib.c
index 7305157d83..7305157d83 100644
--- a/protocols/Yahoo/libyahoo2/yahoo_httplib.c
+++ b/protocols/Yahoo/src/libyahoo2/yahoo_httplib.c
diff --git a/protocols/Yahoo/libyahoo2/yahoo_httplib.h b/protocols/Yahoo/src/libyahoo2/yahoo_httplib.h
index 1698928928..1698928928 100644
--- a/protocols/Yahoo/libyahoo2/yahoo_httplib.h
+++ b/protocols/Yahoo/src/libyahoo2/yahoo_httplib.h
diff --git a/protocols/Yahoo/libyahoo2/yahoo_list.c b/protocols/Yahoo/src/libyahoo2/yahoo_list.c
index b3e40c208e..b3e40c208e 100644
--- a/protocols/Yahoo/libyahoo2/yahoo_list.c
+++ b/protocols/Yahoo/src/libyahoo2/yahoo_list.c
diff --git a/protocols/Yahoo/libyahoo2/yahoo_list.h b/protocols/Yahoo/src/libyahoo2/yahoo_list.h
index abb2c647cd..abb2c647cd 100644
--- a/protocols/Yahoo/libyahoo2/yahoo_list.h
+++ b/protocols/Yahoo/src/libyahoo2/yahoo_list.h
diff --git a/protocols/Yahoo/libyahoo2/yahoo_util.c b/protocols/Yahoo/src/libyahoo2/yahoo_util.c
index a2de75c050..a2de75c050 100644
--- a/protocols/Yahoo/libyahoo2/yahoo_util.c
+++ b/protocols/Yahoo/src/libyahoo2/yahoo_util.c
diff --git a/protocols/Yahoo/libyahoo2/yahoo_util.h b/protocols/Yahoo/src/libyahoo2/yahoo_util.h
index b6a22dea47..b6a22dea47 100644
--- a/protocols/Yahoo/libyahoo2/yahoo_util.h
+++ b/protocols/Yahoo/src/libyahoo2/yahoo_util.h
diff --git a/protocols/Yahoo/links.cpp b/protocols/Yahoo/src/links.cpp
index 8af33e94b3..8af33e94b3 100644
--- a/protocols/Yahoo/links.cpp
+++ b/protocols/Yahoo/src/links.cpp
diff --git a/protocols/Yahoo/main.cpp b/protocols/Yahoo/src/main.cpp
index df432b5223..df432b5223 100644
--- a/protocols/Yahoo/main.cpp
+++ b/protocols/Yahoo/src/main.cpp
diff --git a/protocols/Yahoo/options.cpp b/protocols/Yahoo/src/options.cpp
index 17ff35bb66..17ff35bb66 100644
--- a/protocols/Yahoo/options.cpp
+++ b/protocols/Yahoo/src/options.cpp
diff --git a/protocols/Yahoo/options.h b/protocols/Yahoo/src/options.h
index d707509ec8..d707509ec8 100644
--- a/protocols/Yahoo/options.h
+++ b/protocols/Yahoo/src/options.h
diff --git a/protocols/Yahoo/proto.cpp b/protocols/Yahoo/src/proto.cpp
index dc14b4538e..dc14b4538e 100644
--- a/protocols/Yahoo/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
diff --git a/protocols/Yahoo/proto.h b/protocols/Yahoo/src/proto.h
index e40c465632..e40c465632 100644
--- a/protocols/Yahoo/proto.h
+++ b/protocols/Yahoo/src/proto.h
diff --git a/protocols/Yahoo/resource.h b/protocols/Yahoo/src/resource.h
index ba15e24ad2..ba15e24ad2 100644
--- a/protocols/Yahoo/resource.h
+++ b/protocols/Yahoo/src/resource.h
diff --git a/protocols/Yahoo/search.cpp b/protocols/Yahoo/src/search.cpp
index af0e9f7460..af0e9f7460 100644
--- a/protocols/Yahoo/search.cpp
+++ b/protocols/Yahoo/src/search.cpp
diff --git a/protocols/Yahoo/search.h b/protocols/Yahoo/src/search.h
index 38a76b39ef..38a76b39ef 100644
--- a/protocols/Yahoo/search.h
+++ b/protocols/Yahoo/src/search.h
diff --git a/protocols/Yahoo/server.cpp b/protocols/Yahoo/src/server.cpp
index 34ccfe8dc3..34ccfe8dc3 100644
--- a/protocols/Yahoo/server.cpp
+++ b/protocols/Yahoo/src/server.cpp
diff --git a/protocols/Yahoo/services.cpp b/protocols/Yahoo/src/services.cpp
index 40166100ed..40166100ed 100644
--- a/protocols/Yahoo/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
diff --git a/protocols/Yahoo/user_info.cpp b/protocols/Yahoo/src/user_info.cpp
index d17ca165c7..d17ca165c7 100644
--- a/protocols/Yahoo/user_info.cpp
+++ b/protocols/Yahoo/src/user_info.cpp
diff --git a/protocols/Yahoo/util.cpp b/protocols/Yahoo/src/util.cpp
index 977d0b43cc..977d0b43cc 100644
--- a/protocols/Yahoo/util.cpp
+++ b/protocols/Yahoo/src/util.cpp
diff --git a/protocols/Yahoo/version.h b/protocols/Yahoo/src/version.h
index 0231d7a7ea..0231d7a7ea 100644
--- a/protocols/Yahoo/version.h
+++ b/protocols/Yahoo/src/version.h
diff --git a/protocols/Yahoo/webcam.cpp b/protocols/Yahoo/src/webcam.cpp
index ce8759ba67..ce8759ba67 100644
--- a/protocols/Yahoo/webcam.cpp
+++ b/protocols/Yahoo/src/webcam.cpp
diff --git a/protocols/Yahoo/webcam.h b/protocols/Yahoo/src/webcam.h
index c33b7c5781..c33b7c5781 100644
--- a/protocols/Yahoo/webcam.h
+++ b/protocols/Yahoo/src/webcam.h
diff --git a/protocols/Yahoo/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index 54e0ed3005..54e0ed3005 100644
--- a/protocols/Yahoo/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
diff --git a/protocols/Yahoo/yahoo.h b/protocols/Yahoo/src/yahoo.h
index 29772a0817..29772a0817 100644
--- a/protocols/Yahoo/yahoo.h
+++ b/protocols/Yahoo/src/yahoo.h