diff --git a/Makefile.am b/Makefile.am
index 0659f03ded..7f4358cddc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,8 @@ SUBDIRS = default . pics clients
 bin_PROGRAMS = kwin
 lib_LTLIBRARIES = kwin.la
 
-kwin_la_SOURCES = atoms.cpp  client.cpp main.cpp workspace.cpp \
+# workspace.cpp has to be first in order not to break --enable-final
+kwin_la_SOURCES = workspace.cpp atoms.cpp  client.cpp main.cpp \
 	tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \
 	killwindow.cpp 
 kwin_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kwin/default/libkwindefault.la
diff --git a/client.cpp b/client.cpp
index ad3514143e..0cdc2d1c00 100644
--- a/client.cpp
+++ b/client.cpp
@@ -33,6 +33,12 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include <X11/Xatom.h>
 #include <X11/extensions/shape.h>
 
+// Needed for --enable-final
+// XIconincState is defined in workspace.cpp
+#ifndef IconicState
+#define IconicState XIconicState
+#endif
+
 namespace KWinInternal {
 
 // NET WM Protocol handler class