Restructures Chrome and Firefox plugin VS projects to group source files.

Review by: jat

git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@7128 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/plugins/npapi/VisualStudio/npapi-plugin.vcproj b/plugins/npapi/VisualStudio/npapi-plugin.vcproj
index 5826c32..defedfc 100755
--- a/plugins/npapi/VisualStudio/npapi-plugin.vcproj
+++ b/plugins/npapi/VisualStudio/npapi-plugin.vcproj
@@ -191,157 +191,169 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

 			>

 			<File

-				RelativePath="..\..\platform\Win\AllowDialog.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\AllowedConnections.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\BrowserChannel.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\CheckVersionsMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ChooseTransportMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Debug.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\DebugLevel.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\FatalErrorMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\FreeValueMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HashMap.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HostChannel.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeSpecialMessage.h"

-				>

-			</File>

-			<File

 				RelativePath="..\JavaObject.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\LoadJsniMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadModuleMessage.h"

-				>

-			</File>

-			<File

 				RelativePath="..\LocalObjectTable.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\Message.h"

-				>

-			</File>

-			<File

 				RelativePath="..\mozincludes.h"

 				>

 			</File>

 			<File

-				RelativePath="..\npapi\npapi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\npapi\nphostapi.h"

-				>

-			</File>

-			<File

 				RelativePath="..\NPObjectWrapper.h"

 				>

 			</File>

 			<File

-				RelativePath="..\npapi\npruntime.h"

-				>

-			</File>

-			<File

 				RelativePath="..\NPVariantWrapper.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\Platform.h"

-				>

-			</File>

-			<File

 				RelativePath="..\Plugin.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\platform\Win\Preferences.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ProtocolVersionMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\QuitMessage.h"

-				>

-			</File>

-			<File

 				RelativePath="..\resource.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\ReturnMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"

-				>

-			</File>

-			<File

 				RelativePath="..\ScriptableInstance.h"

 				>

 			</File>

-			<File

-				RelativePath="..\..\common\ServerMethods.h"

+			<Filter

+				Name="common"

 				>

-			</File>

-			<File

-				RelativePath="..\..\common\SessionHandler.h"

+				<File

+					RelativePath="..\..\common\AllowedConnections.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\BrowserChannel.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\CheckVersionsMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ChooseTransportMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Debug.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\DebugLevel.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FatalErrorMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FreeValueMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\HashMap.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\HostChannel.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeSpecialMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadJsniMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadModuleMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Message.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Platform.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ProtocolVersionMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\QuitMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ReturnMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ServerMethods.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\SessionHandler.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Socket.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\SwitchTransportMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Value.h"

+					>

+				</File>

+			</Filter>

+			<Filter

+				Name="win"

 				>

-			</File>

-			<File

-				RelativePath="..\..\common\Socket.h"

+				<File

+					RelativePath="..\..\platform\Win\AllowDialog.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\platform\Win\Preferences.h"

+					>

+				</File>

+			</Filter>

+			<Filter

+				Name="npapi"

 				>

-			</File>

-			<File

-				RelativePath="..\..\common\SwitchTransportMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Value.h"

-				>

-			</File>

+				<File

+					RelativePath="..\npapi\npapi.h"

+					>

+				</File>

+				<File

+					RelativePath="..\npapi\nphostapi.h"

+					>

+				</File>

+				<File

+					RelativePath="..\npapi\npruntime.h"

+					>

+				</File>

+			</Filter>

 		</Filter>

 		<Filter

 			Name="Resource Files"

@@ -359,58 +371,10 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

-				RelativePath="..\..\platform\Win\AllowDialog.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\AllowedConnections.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\CheckVersionsMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ChooseTransportMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Debug.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\FatalErrorMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\FreeValueMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HostChannel.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeSpecialMessage.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\JavaObject.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\LoadJsniMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadModuleMessage.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\LocalObjectTable.cpp"

 				>

 			</File>

@@ -419,11 +383,11 @@
 				>

 			</File>

 			<File

-				RelativePath="..\npn_bindings.cc"

+				RelativePath="..\npGwtDevPlugin.def"

 				>

 			</File>

 			<File

-				RelativePath="..\npGwtDevPlugin.def"

+				RelativePath="..\npn_bindings.cc"

 				>

 			</File>

 			<File

@@ -431,33 +395,89 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\platform\Win\Preferences.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ProtocolVersionMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ReturnMessage.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\ScriptableInstance.cpp"

 				>

 			</File>

-			<File

-				RelativePath="..\..\common\ServerMethods.cpp"

+			<Filter

+				Name="common"

 				>

-			</File>

-			<File

-				RelativePath="..\..\common\Socket.cpp"

+				<File

+					RelativePath="..\..\common\AllowedConnections.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\CheckVersionsMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ChooseTransportMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Debug.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FatalErrorMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FreeValueMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\HostChannel.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeSpecialMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadJsniMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadModuleMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ProtocolVersionMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ReturnMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ServerMethods.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Socket.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\SwitchTransportMessage.cpp"

+					>

+				</File>

+			</Filter>

+			<Filter

+				Name="win"

 				>

-			</File>

-			<File

-				RelativePath="..\..\common\SwitchTransportMessage.cpp"

-				>

-			</File>

+				<File

+					RelativePath="..\..\platform\Win\AllowDialog.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\platform\Win\Preferences.cpp"

+					>

+				</File>

+			</Filter>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/plugins/xpcom/VisualStudio/ff3-xpcom.vcproj b/plugins/xpcom/VisualStudio/ff3-xpcom.vcproj
index e8058f7..45150c8 100755
--- a/plugins/xpcom/VisualStudio/ff3-xpcom.vcproj
+++ b/plugins/xpcom/VisualStudio/ff3-xpcom.vcproj
@@ -196,66 +196,14 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

 			>

 			<File

-				RelativePath="..\..\common\AllowedConnections.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\BrowserChannel.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ByteOrder.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\CheckVersionsMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ChooseTransportMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Debug.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\DebugLevel.h"

-				>

-			</File>

-			<File

 				RelativePath="..\ExternalWrapper.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\FatalErrorMessage.h"

-				>

-			</File>

-			<File

 				RelativePath="..\FFSessionHandler.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\FreeValueMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HashMap.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HostChannel.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeSpecialMessage.h"

-				>

-			</File>

-			<File

 				RelativePath="..\prebuilt\ff3\include\IOOPHM.h"

 				>

 			</File>

@@ -264,383 +212,19 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsapi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsautocfg.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jscompat.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsconfig.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jscpucfg.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jslong.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsosdep.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsotypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsproto.tbl"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jspubtd.h"

-				>

-			</File>

-			<File

 				RelativePath="..\JSRunner.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jstypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadJsniMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadModuleMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Message.h"

-				>

-			</File>

-			<File

 				RelativePath="..\ModuleOOPHM.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include\mozilla-config.h"

-				>

-			</File>

-			<File

 				RelativePath="..\mozincludes.h"

 				>

 			</File>

 			<File

-				RelativePath="..\npapi\npapi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\npapi\nphostapi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\npapi\npruntime.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsAXPCNativeCallContext.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsCOMPtr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nscore.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nscore.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsCycleCollector.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsDebug.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsError.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsEvent.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsICategoryManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIClassInfo.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIClassInfoImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIComponentManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsID.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIEnumerator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIException.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIExceptionService.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIFactory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIGenericFactory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIHttpProtocolHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIInterfaceInfo.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIInterfaceInfoManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIJSContextStack.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIMemory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIModule.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIPrincipal.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProgrammingLanguage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProtocolHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProxiedProtocolHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptableInterfaces.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptGlobalObject.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptObjectPrincipal.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISecurityCheckedComponent.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISerializable.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIServiceManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISimpleEnumerator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISimpleEnumerator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupports.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupports.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsBase.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsBase.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsUtils.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsUtils.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIURI.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIVariant.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIXPConnect.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsMemory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsNetCID.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsrootidl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsrootidl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsServiceManagerUtils.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsStringAPI.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsTraceRefcnt.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOM.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOMCID.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOMStrings.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Platform.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\pratom.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prcpucfg.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prinrval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlock.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlog.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlong.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ProtocolVersionMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\obsolete\protypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prthread.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prtime.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prtypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\QuitMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ReturnMessage.h"

+				RelativePath="..\Preferences.h"

 				>

 			</File>

 			<File

@@ -648,65 +232,481 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ServerMethods.h"

-				>

-			</File>

-			<File

 				RelativePath="..\SessionData.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\SessionHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Socket.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\SwitchTransportMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Value.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpccomponents.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpcexception.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpcjsid.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include\xpcom-config.h"

-				>

-			</File>

-			<File

 				RelativePath="..\XpcomDebug.h"

 				>

 			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpt_arena.h"

+			<Filter

+				Name="common"

 				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpt_struct.h"

+				<File

+					RelativePath="..\..\common\AllowedConnections.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\BrowserChannel.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ByteOrder.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\CheckVersionsMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ChooseTransportMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Debug.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\DebugLevel.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FatalErrorMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FreeValueMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\HashMap.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\HostChannel.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeSpecialMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadJsniMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadModuleMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Message.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Platform.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ProtocolVersionMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\QuitMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ReturnMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ServerMethods.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\SessionHandler.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Socket.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\SwitchTransportMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Value.h"

+					>

+				</File>

+			</Filter>

+			<Filter

+				Name="gecko"

 				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xptinfo.h"

-				>

-			</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsapi.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsautocfg.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jscompat.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsconfig.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jscpucfg.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jslong.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsosdep.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsotypes.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsproto.tbl"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jspubtd.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jstypes.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\jsutil.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include\mozilla-config.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsAXPCNativeCallContext.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsCOMPtr.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nscore.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nscore.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsCycleCollector.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsDebug.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsError.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsEvent.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsICategoryManager.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIClassInfo.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIClassInfoImpl.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIComponentManager.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsID.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIEnumerator.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIException.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIExceptionService.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIFactory.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIGenericFactory.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIHttpProtocolHandler.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIInterfaceInfo.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIInterfaceInfoManager.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIJSContextStack.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIMemory.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIModule.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIPrincipal.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProgrammingLanguage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProtocolHandler.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIProxiedProtocolHandler.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptableInterfaces.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptGlobalObject.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIScriptObjectPrincipal.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISecurityCheckedComponent.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISerializable.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIServiceManager.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISimpleEnumerator.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISimpleEnumerator.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupports.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupports.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsBase.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsBase.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsImpl.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsUtils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsISupportsUtils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIURI.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIVariant.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsIXPConnect.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsMemory.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsNetCID.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsrootidl.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsrootidl.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsServiceManagerUtils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsStringAPI.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsTraceRefcnt.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOM.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOMCID.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\nsXPCOMStrings.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\pratom.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prcpucfg.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prinrval.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlock.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlog.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prlong.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\obsolete\protypes.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prthread.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prtime.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\prtypes.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpccomponents.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpcexception.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpcjsid.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\WINNT_x86-msvc\include\xpcom-config.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpt_arena.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xpt_struct.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.0\include\xptinfo.h"

+					>

+				</File>

+			</Filter>

 		</Filter>

 		<Filter

 			Name="Resource Files"

@@ -724,50 +724,14 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

-				RelativePath="..\..\common\AllowedConnections.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\CheckVersionsMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ChooseTransportMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Debug.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\ExternalWrapper.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\FatalErrorMessage.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\FFSessionHandler.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\FreeValueMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HostChannel.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeSpecialMessage.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\JavaObject.cpp"

 				>

 			</File>

@@ -776,14 +740,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\common\LoadJsniMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadModuleMessage.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\ModuleOOPHM.cpp"

 				>

 				<FileConfiguration

@@ -800,30 +756,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\Preferences.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ProtocolVersionMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ReturnMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ServerMethods.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Socket.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\SwitchTransportMessage.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\XpcomDebug.cpp"

 				>

 			</File>

@@ -831,6 +763,74 @@
 				RelativePath="..\xpGwtDevPlugin.def"

 				>

 			</File>

+			<Filter

+				Name="common"

+				>

+				<File

+					RelativePath="..\..\common\AllowedConnections.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\CheckVersionsMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ChooseTransportMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Debug.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FatalErrorMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FreeValueMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\HostChannel.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeSpecialMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadJsniMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadModuleMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ProtocolVersionMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ReturnMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ServerMethods.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Socket.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\SwitchTransportMessage.cpp"

+					>

+				</File>

+			</Filter>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/plugins/xpcom/VisualStudio/ff35-xpcom.vcproj b/plugins/xpcom/VisualStudio/ff35-xpcom.vcproj
index 9e96c85..547a064 100755
--- a/plugins/xpcom/VisualStudio/ff35-xpcom.vcproj
+++ b/plugins/xpcom/VisualStudio/ff35-xpcom.vcproj
@@ -196,66 +196,14 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

 			>

 			<File

-				RelativePath="..\..\common\AllowedConnections.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\BrowserChannel.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ByteOrder.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\CheckVersionsMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ChooseTransportMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Debug.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\DebugLevel.h"

-				>

-			</File>

-			<File

 				RelativePath="..\ExternalWrapper.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\FatalErrorMessage.h"

-				>

-			</File>

-			<File

 				RelativePath="..\FFSessionHandler.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\FreeValueMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HashMap.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HostChannel.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeSpecialMessage.h"

-				>

-			</File>

-			<File

 				RelativePath="..\prebuilt\ff35\include\IOOPHM.h"

 				>

 			</File>

@@ -264,453 +212,501 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsapi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsautocfg.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jscompat.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsconfig.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\jscpucfg.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jslong.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\jsosdep.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsotypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsproto.tbl"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jspubtd.h"

-				>

-			</File>

-			<File

 				RelativePath="..\JSRunner.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jstypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadJsniMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadModuleMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Message.h"

-				>

-			</File>

-			<File

 				RelativePath="..\ModuleOOPHM.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include\mozilla-config.h"

-				>

-			</File>

-			<File

 				RelativePath="..\mozincludes.h"

 				>

 			</File>

 			<File

-				RelativePath="..\npapi\npapi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\npapi\nphostapi.h"

-				>

-			</File>

-			<File

-				RelativePath="..\npapi\npruntime.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsAXPCNativeCallContext.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsCOMPtr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nscore.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nscore.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsCycleCollector.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsDebug.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsError.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget\nsEvent.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsICategoryManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIClassInfo.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIClassInfoImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIComponentManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsID.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIEnumerator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIException.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIExceptionService.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIFactory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIGenericFactory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIHttpProtocolHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIInterfaceInfo.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIInterfaceInfoManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIJSContextStack.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIMemory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIModule.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps\nsIPrincipal.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIProgrammingLanguage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIProtocolHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIProxiedProtocolHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIScriptableInterfaces.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom\nsIScriptGlobalObject.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom\nsIScriptObjectPrincipal.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps\nsISecurityCheckedComponent.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISerializable.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIServiceManager.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISimpleEnumerator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISimpleEnumerator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupports.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupports.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupportsBase.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsBase.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsUtils.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupportsUtils.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIURI.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIVariant.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIXPConnect.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsMemory.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsNetCID.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsrootidl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsrootidl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsServiceManagerUtils.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsStringAPI.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsTraceRefcnt.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOM.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOMCID.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOMStrings.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Platform.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\pratom.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prcpucfg.h"

-				>

-			</File>

-			<File

 				RelativePath="..\Preferences.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prinrval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlock.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlog.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlong.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ProtocolVersionMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\obsolete\protypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prthread.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prtime.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prtypes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\QuitMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ReturnMessage.h"

-				>

-			</File>

-			<File

 				RelativePath="..\RootedObject.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ServerMethods.h"

-				>

-			</File>

-			<File

 				RelativePath="..\SessionData.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\SessionHandler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Socket.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\SwitchTransportMessage.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Value.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpccomponents.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpcexception.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpcjsid.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include\xpcom-config.h"

-				>

-			</File>

-			<File

 				RelativePath="..\XpcomDebug.h"

 				>

 			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xpt_arena.h"

+			<Filter

+				Name="common"

 				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xpt_struct.h"

+				<File

+					RelativePath="..\..\common\AllowedConnections.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\BrowserChannel.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ByteOrder.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\CheckVersionsMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ChooseTransportMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Debug.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\DebugLevel.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FatalErrorMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FreeValueMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\HashMap.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\HostChannel.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeSpecialMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadJsniMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadModuleMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Message.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Platform.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ProtocolVersionMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\QuitMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ReturnMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\scoped_ptr\scoped_ptr.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ServerMethods.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\SessionHandler.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Socket.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\SwitchTransportMessage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Value.h"

+					>

+				</File>

+			</Filter>

+			<Filter

+				Name="gecko"

 				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xptinfo.h"

-				>

-			</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsapi.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsautocfg.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jscompat.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsconfig.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\jscpucfg.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jslong.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\jsosdep.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsotypes.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsproto.tbl"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jspubtd.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jstypes.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\js\jsutil.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include\mozilla-config.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsAXPCNativeCallContext.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsCOMPtr.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nscore.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nscore.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsCycleCollector.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsDebug.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsError.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\widget\nsEvent.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsICategoryManager.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIClassInfo.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIClassInfoImpl.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIComponentManager.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsID.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIEnumerator.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIException.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIExceptionService.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIFactory.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIGenericFactory.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIHttpProtocolHandler.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIInterfaceInfo.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIInterfaceInfoManager.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIJSContextStack.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIMemory.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIModule.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps\nsIPrincipal.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIProgrammingLanguage.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIProtocolHandler.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsIProxiedProtocolHandler.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIScriptableInterfaces.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom\nsIScriptGlobalObject.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\dom\nsIScriptObjectPrincipal.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\caps\nsISecurityCheckedComponent.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISerializable.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIServiceManager.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISimpleEnumerator.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISimpleEnumerator.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupports.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupports.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupportsBase.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsBase.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsImpl.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsISupportsUtils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsISupportsUtils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsIURI.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsIVariant.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\nsIXPConnect.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsMemory.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\necko\nsNetCID.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\nsrootidl.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsrootidl.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsServiceManagerUtils.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsStringAPI.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsTraceRefcnt.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOM.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOMCID.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\nsXPCOMStrings.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\pratom.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prcpucfg.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prinrval.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlock.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlog.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prlong.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\obsolete\protypes.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prthread.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prtime.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\prtypes.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpccomponents.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpcexception.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpconnect\xpcjsid.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\WINNT_x86-msvc\include\xpcom-config.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xpt_arena.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xpt_struct.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\..\plugin-sdks\gecko-sdks\gecko-1.9.1\include\xpcom\xptinfo.h"

+					>

+				</File>

+			</Filter>

 		</Filter>

 		<Filter

 			Name="Resource Files"

@@ -728,50 +724,14 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

-				RelativePath="..\..\common\AllowedConnections.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\CheckVersionsMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ChooseTransportMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Debug.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\ExternalWrapper.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\FatalErrorMessage.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\FFSessionHandler.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\..\common\FreeValueMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\HostChannel.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\InvokeSpecialMessage.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\JavaObject.cpp"

 				>

 			</File>

@@ -780,14 +740,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\common\LoadJsniMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\LoadModuleMessage.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\ModuleOOPHM.cpp"

 				>

 				<FileConfiguration

@@ -804,26 +756,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\common\ProtocolVersionMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ReturnMessage.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\ServerMethods.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\Socket.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\common\SwitchTransportMessage.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\XpcomDebug.cpp"

 				>

 			</File>

@@ -831,6 +763,74 @@
 				RelativePath="..\xpGwtDevPlugin.def"

 				>

 			</File>

+			<Filter

+				Name="common"

+				>

+				<File

+					RelativePath="..\..\common\AllowedConnections.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\CheckVersionsMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ChooseTransportMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Debug.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FatalErrorMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\FreeValueMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\HostChannel.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\InvokeSpecialMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadJsniMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\LoadModuleMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ProtocolVersionMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ReturnMessage.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\ServerMethods.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\Socket.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\common\SwitchTransportMessage.cpp"

+					>

+				</File>

+			</Filter>

 		</Filter>

 	</Files>

 	<Globals>