diff --git a/Makefile.am b/Makefile.am
index 84f6b24440..a77a23431a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ kwinincludedir = $(includedir)/kwin
 kwininclude_HEADERS = options.h client.h workspace.h
 
 kwin_SOURCES = kwin_main.cpp
-kwin_LDADD = kwin.la $(LIBXINERAMA)
+kwin_LDADD = kwin.la 
 kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
 KDE_ICON = kwin
diff --git a/workspace.cpp b/workspace.cpp
index 369fd75820..60ce4d8402 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -2885,10 +2885,10 @@ QPoint Workspace::adjustClientPosition( Client* c, QPoint pos )
          for (l = clients.begin();l != clients.end();++l )
          {
             if ((*l)->isOnDesktop(currentDesktop()) && (*l) != desktop_client &&
-               !(*l)->isIconified() 
-#if 0		
-		&& (*l)->transientFor() == None 
-#endif		
+               !(*l)->isIconified()
+#if 0
+		&& (*l)->transientFor() == None
+#endif
 		&& (*l) != c )
             {
                lx = (*l)->x();
@@ -3643,6 +3643,11 @@ QRect Workspace::clientArea(clientAreaOption opt)
     return area.intersect(rect);
 }
 
+// ### KDE3: remove me!
+QRect Workspace::clientArea()
+{
+    return clientArea( MaximizeArea );
+}
 
 void Workspace::loadDesktopSettings()
 {
@@ -3730,5 +3735,5 @@ void Workspace::checkStartOnDesktop( WId w )
     if( info.desktop() == 0 )
         info.setDesktop( data.desktop());
 }
-    
+
 #include "workspace.moc"
diff --git a/workspace.h b/workspace.h
index 2fe8d2db42..e8b1030f76 100644
--- a/workspace.h
+++ b/workspace.h
@@ -115,7 +115,10 @@ public:
 
     enum clientAreaOption { PlacementArea, MovementArea, MaximizeArea };
 
-    QRect clientArea(clientAreaOption opt = MaximizeArea);
+
+    // default is MaximizeArea
+    QRect clientArea();  // ### KDE3: remove me!
+    QRect clientArea(clientAreaOption);
 
     void removeClient( Client* );