diff --git a/clientgui/DlgAdvPreferences.cpp b/clientgui/DlgAdvPreferences.cpp
index 3e94b7450a..1c3a501eb3 100644
--- a/clientgui/DlgAdvPreferences.cpp
+++ b/clientgui/DlgAdvPreferences.cpp
@@ -20,17 +20,19 @@
 #endif
 
 #include "stdwx.h"
+#include "BOINCGUIApp.h"
+#include "MainDocument.h"
+#include "SkinManager.h"
+#include "BOINCBaseFrame.h"
 #include "DlgAdvPreferences.h"
 #include "res/usage.xpm"
 #include "res/xfer.xpm"
 #include "res/proj.xpm"
 #include "res/warning.xpm"
-#include "BOINCGUIApp.h"
-#include "MainDocument.h"
-#include "SkinManager.h"
 #include "hyperlink.h"
 #include "Events.h"
 #include "error_numbers.h"
+#include "version.h"
 
 using std::string;
 
@@ -692,9 +694,9 @@ void CDlgAdvPreferences::OnHelp(wxCommandEvent& ev) {
             wxT("%s?target=advanced_preferences&version=%s&controlid=%d"),
             wxString(url.c_str(), wxConvUTF8).c_str(),
             wxString(BOINC_VERSION_STRING, wxConvUTF8).c_str(),
-            event.GetId()
+            ev.GetId()
         );
-        ExecuteBrowserLink(wxurl);
+        wxGetApp().GetFrame()->ExecuteBrowserLink(wxurl);
     }
 }
 
diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp
index 3db62668ce..7fcd628635 100644
--- a/clientgui/sg_DlgMessages.cpp
+++ b/clientgui/sg_DlgMessages.cpp
@@ -31,6 +31,7 @@
 #include "BOINCGUIApp.h"
 #include "SkinManager.h"
 #include "MainDocument.h"
+#include "BOINCBaseFrame.h"
 #include "hyperlink.h"
 #include "version.h"
 
@@ -449,7 +450,7 @@ void CPanelMessages::OnButtonHelp( wxCommandEvent& event ) {
             wxString(BOINC_VERSION_STRING, wxConvUTF8).c_str(),
             event.GetId()
         );
-        ExecuteBrowserLink(wxurl);
+        wxGetApp().GetFrame()->ExecuteBrowserLink(wxurl);
     }
 
     wxLogTrace(wxT("Function Start/End"), wxT("CPanelMessages::OnHelp - Function End"));
@@ -842,7 +843,7 @@ void CDlgMessages::OnHelp(wxHelpEvent& event) {
             wxString(BOINC_VERSION_STRING, wxConvUTF8).c_str(),
             event.GetId()
         );
-        ExecuteBrowserLink(wxurl);
+        wxGetApp().GetFrame()->ExecuteBrowserLink(wxurl);
     }
 
     wxLogTrace(wxT("Function Start/End"), wxT("CDlgMessages::OnHelp - Function End"));
diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp
index 6fcdeaea8d..b635874dd4 100644
--- a/clientgui/sg_DlgPreferences.cpp
+++ b/clientgui/sg_DlgPreferences.cpp
@@ -30,6 +30,7 @@
 #include "BOINCGUIApp.h"
 #include "SkinManager.h"
 #include "MainDocument.h"
+#include "BOINCBaseFrame.h"
 #include "hyperlink.h"
 #include "version.h"
 
@@ -574,7 +575,7 @@ void CPanelPreferences::OnButtonHelp( wxCommandEvent& event ) {
             wxString(BOINC_VERSION_STRING, wxConvUTF8).c_str(),
             event.GetId()
         );
-        ExecuteBrowserLink(wxurl);
+        wxGetApp().GetFrame()->ExecuteBrowserLink(wxurl);
     }
 
     wxLogTrace(wxT("Function Start/End"), wxT("CPanelPreferences::OnHelp - Function End"));
@@ -1081,7 +1082,7 @@ void CDlgPreferences::OnHelp(wxHelpEvent& event) {
             wxString(BOINC_VERSION_STRING, wxConvUTF8).c_str(),
             event.GetId()
         );
-        ExecuteBrowserLink(wxurl);
+        wxGetApp().GetFrame()->ExecuteBrowserLink(wxurl);
     }
 
     wxLogTrace(wxT("Function Start/End"), wxT("CDlgPreferences::OnHelp - Function End"));