7 files changed, 11 insertions, 13 deletions
diff --git a/WebKitTools/Drosera/mac/launcher.m b/WebKitTools/Drosera/mac/launcher.m
index 7722312..04c5ccb 100644
--- a/WebKitTools/Drosera/mac/launcher.m
+++ b/WebKitTools/Drosera/mac/launcher.m
@@ -63,15 +63,6 @@ static void myExecve(NSString *executable, NSArray *args, NSDictionary *environm
     execve([executable fileSystemRepresentation], argv, env);
 }
 
-NSString *currentSystemVersion()
-{
-    long version;
-    if (Gestalt(gestaltSystemVersion, &version) != noErr)
-        return @"10.4";
-
-    return [NSString stringWithFormat:@"%x.%x", (version & 0xFF00) >> 8, (version & 0x00F0) >> 4];
-}
-
 int main(int argc, char *argv[])
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -83,7 +74,7 @@ int main(int argc, char *argv[])
         displayErrorAndQuit(@"Unable to locate WebKit.app", @"Drosera nightly builds require WebKit.app to run. Please check that it is available and then try again.");
 
     NSBundle *webKitAppBundle = [NSBundle bundleWithPath:[(NSURL *)webkitURL path]];
-    NSString *frameworkPath = [[webKitAppBundle privateFrameworksPath] stringByAppendingPathComponent:currentSystemVersion()];
+    NSString *frameworkPath = [webKitAppBundle resourcePath];
     NSBundle *droseraBundle = [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"Drosera" ofType:@"app"]];
     NSString *executablePath = [droseraBundle executablePath];
     NSString *pathToEnablerLib = [webKitAppBundle pathForResource:@"WebKitNightlyEnabler" ofType:@"dylib"];
diff --git a/WebKitTools/Drosera/win/BaseDelegate.h b/WebKitTools/Drosera/win/BaseDelegate.h
index 6bc2f3f..eb43293 100644
--- a/WebKitTools/Drosera/win/BaseDelegate.h
+++ b/WebKitTools/Drosera/win/BaseDelegate.h
@@ -29,7 +29,8 @@
 #ifndef BaseDelegate_H
 #define BaseDelegate_H
 
-#include <WebKit/WebKit.h>
+#include <WebKit/IWebFrameLoadDelegate.h>
+#include <WebKit/IWebUIDelegate.h>
 
 struct IDataObject;
 struct IPropertyBag;
diff --git a/WebKitTools/Drosera/win/DebuggerClient.cpp b/WebKitTools/Drosera/win/DebuggerClient.cpp
index 77b689c..b15c61d 100644
--- a/WebKitTools/Drosera/win/DebuggerClient.cpp
+++ b/WebKitTools/Drosera/win/DebuggerClient.cpp
@@ -33,6 +33,8 @@
 #include "ServerConnection.h"
 
 #include <WebKit/ForEachCoClass.h>
+#include <WebKit/IWebView.h>
+#include <WebKit/IWebViewPrivate.h>
 #include <WebKit/WebKit.h>
 #include <JavaScriptCore/JSContextRef.h>
 
diff --git a/WebKitTools/Drosera/win/DebuggerDocumentPlatform.cpp b/WebKitTools/Drosera/win/DebuggerDocumentPlatform.cpp
index f23daf7..36e51e2 100644
--- a/WebKitTools/Drosera/win/DebuggerDocumentPlatform.cpp
+++ b/WebKitTools/Drosera/win/DebuggerDocumentPlatform.cpp
@@ -33,7 +33,7 @@
 #include <JavaScriptCore/JSRetainPtr.h>
 #include <JavaScriptCore/JSStringRef.h>
 #include <JavaScriptCore/JSStringRefBSTR.h>
-#include <WebKit/WebKit.h>
+#include <WebKit/IWebScriptCallFrame.h>
 
 JSValueRef JSValueRefCreateWithBSTR(JSContextRef context, BSTR string)
 {
diff --git a/WebKitTools/Drosera/win/Drosera.cpp b/WebKitTools/Drosera/win/Drosera.cpp
index 820054f..5e35c8c 100644
--- a/WebKitTools/Drosera/win/Drosera.cpp
+++ b/WebKitTools/Drosera/win/Drosera.cpp
@@ -36,6 +36,8 @@
 
 #include <JavaScriptCore/JSStringRef.h>
 #include <WebKit/ForEachCoClass.h>
+#include <WebKit/IWebMutableURLRequest.h>
+#include <WebKit/IWebView.h>
 #include <WebKit/WebKit.h>
 #include <wtf/RetainPtr.h>
 
diff --git a/WebKitTools/Drosera/win/ServerConnection.cpp b/WebKitTools/Drosera/win/ServerConnection.cpp
index de2b416..e59c4fc 100644
--- a/WebKitTools/Drosera/win/ServerConnection.cpp
+++ b/WebKitTools/Drosera/win/ServerConnection.cpp
@@ -37,6 +37,8 @@
 #include <JavaScriptCore/JSStringRefBSTR.h>
 #include <JavaScriptCore/RetainPtr.h>
 #include <WebKit/ForEachCoClass.h>
+#include <WebKit/IWebScriptCallFrame.h>
+#include <WebKit/IWebScriptDebugServer.h>
 #include <WebKit/WebKit.h>
 
 #include <iostream>
diff --git a/WebKitTools/Drosera/win/ServerConnection.h b/WebKitTools/Drosera/win/ServerConnection.h
index c0b64cf..765d487 100644
--- a/WebKitTools/Drosera/win/ServerConnection.h
+++ b/WebKitTools/Drosera/win/ServerConnection.h
@@ -32,7 +32,7 @@
 
 #include <string>
 #include <WebCore/COMPtr.h>
-#include <WebKit/WebKit.h>
+#include <WebKit/IWebScriptDebugListener.h>
 
 class DebuggerClient;
 interface IWebScriptCallFrame;