diff --git a/bridge.cpp b/bridge.cpp
index d811fb97c7..18b70c4f90 100644
--- a/bridge.cpp
+++ b/bridge.cpp
@@ -84,7 +84,7 @@ bool Bridge::isPreview() const
 
 QRect Bridge::iconGeometry() const
     {
-    NETRect r = c->netWinInfo()->iconGeometry();
+    NETRect r = c->info->iconGeometry();
     return QRect( r.pos.x, r.pos.y, r.size.width, r.size.height );
     }
 
diff --git a/client.cpp b/client.cpp
index 544dac14d3..dc896e8521 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1693,11 +1693,6 @@ void Client::autoRaise()
     autoRaiseTimer = 0;
     }
 
-NETWinInfo * Client::netWinInfo()
-    {
-    return static_cast<NETWinInfo *>(info);
-    }
-
 #ifdef NDEBUG
 kndbgstream& operator<<( kndbgstream& stream, const Client* cl ) { return stream; }
 #else
diff --git a/client.h b/client.h
index 632e78508f..8938803719 100644
--- a/client.h
+++ b/client.h
@@ -27,7 +27,6 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <X11/Xutil.h>
 #include <fixx11h.h>
 
-class NETWinInfo;
 class QTimer;
 class KProcess;
 class KStartupInfoData;
@@ -299,8 +298,6 @@ class Client : public QObject, public KDecorationDefines
 
         void processDecorationButtonPress( int button, int state, int x, int y, int x_root, int y_root );
 
-        NETWinInfo * netWinInfo(); // APICLEAN ???
-
     private slots:
         void pingTimeout();
         void processKillerExited();
diff --git a/geometry.cpp b/geometry.cpp
index 651ed0ac68..5b7129a2be 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -332,9 +332,9 @@ void Workspace::setClientIsMoving( Client *c )
     // window while still moving the first one.
     movingClient = c;
     if (movingClient)
-       focus_change = false;
+        setFocusChangeEnabled( false );
     else
-       focus_change = true;
+        setFocusChangeEnabled( true );
     }
 
 /*!
diff --git a/workspace.h b/workspace.h
index a25ba4163d..c81c2fb998 100644
--- a/workspace.h
+++ b/workspace.h
@@ -154,8 +154,8 @@ class Workspace : public QObject, virtual public KWinInterface, public KDecorati
 
         void updateColormap();
 
-        void setFocusChangeEnabled(bool b) { focus_change = b; }  // KDE 3.0: No longer used
-        bool focusChangeEnabled() { return focus_change; }  // KDE 3.0: No longer used
+        void setFocusChangeEnabled(bool b) { focus_change = b; }
+        bool focusChangeEnabled() { return focus_change; }
 
         /**
          * Indicates that the client c is being moved around by the user.