diff --git a/src/frontends/gtk/GScreen.C b/src/frontends/gtk/GScreen.C
index 702b5bb44d..ecd5707efa 100644
--- a/src/frontends/gtk/GScreen.C
+++ b/src/frontends/gtk/GScreen.C
@@ -32,16 +32,18 @@
 
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
-#include "frontends/WorkArea.h"
 
 #include "insets/insettext.h"
 
 #include <algorithm>
 
+// FIXME: defined in X.h, spuriously pulled in by some gui headers
+#undef CursorShape
+
 namespace lyx {
 namespace frontend {
 
-using lyx::frontend::CursorShape;
+	//using lyx::frontend::CursorShape;
 
 GScreen::GScreen(GWorkArea & o)
 	: owner_(o)
diff --git a/src/frontends/gtk/GScreen.h b/src/frontends/gtk/GScreen.h
index fc717ae71e..94f35afa3b 100644
--- a/src/frontends/gtk/GScreen.h
+++ b/src/frontends/gtk/GScreen.h
@@ -16,6 +16,9 @@
 
 #include <gtkmm.h>
 
+// FIXME: defined in X.h, spuriously pulled in by some gui headers
+#undef CursorShape
+
 namespace lyx {
 namespace frontend {
 
diff --git a/src/frontends/gtk/GWorkArea.C b/src/frontends/gtk/GWorkArea.C
index 19d973e8ca..3867841a25 100644
--- a/src/frontends/gtk/GWorkArea.C
+++ b/src/frontends/gtk/GWorkArea.C
@@ -28,6 +28,8 @@
 #include "funcrequest.h"
 #include "LColor.h"
 #include "WorkArea.h"
+#include "Gui.h"
+#include "Selection.h"
 
 using boost::shared_ptr;
 
diff --git a/src/frontends/gtk/GWorkArea.h b/src/frontends/gtk/GWorkArea.h
index f8d83e567a..3ee079c23a 100644
--- a/src/frontends/gtk/GWorkArea.h
+++ b/src/frontends/gtk/GWorkArea.h
@@ -21,6 +21,9 @@
 
 #include <X11/Xft/Xft.h>
 
+// FIXME: defined in X.h, spuriously pulled in by some gui headers
+#undef CursorShape
+
 class LColor_color;
 class LyXView;
 
diff --git a/src/frontends/gtk/GuiImplementation.C b/src/frontends/gtk/GuiImplementation.C
index 622aca7fce..6a350c9e78 100644
--- a/src/frontends/gtk/GuiImplementation.C
+++ b/src/frontends/gtk/GuiImplementation.C
@@ -24,6 +24,9 @@
 #include "GView.h"
 #include "BufferView.h"
 
+// FIXME: defined in X.h, spuriously pulled in by some gui headers
+#undef CursorShape
+
 namespace lyx {
 namespace frontend {
 
diff --git a/src/frontends/qt3/QWorkArea.C b/src/frontends/qt3/QWorkArea.C
index e24be3c7d5..5a6198f1a0 100644
--- a/src/frontends/qt3/QWorkArea.C
+++ b/src/frontends/qt3/QWorkArea.C
@@ -22,6 +22,8 @@
 #include "funcrequest.h"
 #include "LColor.h"
 #include "support/os.h"
+#include "frontends/Gui.h"
+#include "frontends/Selection.h"
 
 #include <qapplication.h>
 #include <qclipboard.h>
@@ -111,7 +113,7 @@ bool lyxX11EventFilter(XEvent * xev)
 	case SelectionRequest:
 		lyxerr[Debug::GUI] << "X requested selection." << endl;
 		if (wa_ptr) {
-			lyx::docstring const sel = wa_ptr->view().requestSelection();
+			lyx::docstring const sel = wa_ptr->view().view()->requestSelection();
 			if (!sel.empty())
 				wa_ptr->view().gui().selection().put(sel);
 		}