Clean up the X11 definitions after the X11 includes.

This fixes build problems after 8f43c5e: sm.h would include
X11/SM/SMlib.h, which includes X11/ICE/ICElib.h, which adds a #define
Status int, which breaks qdeclarativeview.h, included by
moc_declarative.cpp.

Reviewed-by: mgraesslin

sm.h

@@ -25,10 +25,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDataStream>
 #include <kapplication.h>
 #include <ksessionmanager.h>
-#include <X11/SM/SMlib.h>
 #include <netwm_def.h>
 #include <QRect>
 
+#include <X11/SM/SMlib.h>
+#include <fixx11h.h>
+
 class QSocketNotifier;
 
 namespace KWin