Partially pruned out of X.org commits:

 commit 987579c930bda803427a28cb82773c389f5110d6
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Wed Apr 22 13:26:40 2009 +1000

    dix: remove all but main() from main.c

    All other functions are pushed into where they seemed to fit.
    main.c is now linked separately into libmain.a and linked in by the various
    DDXs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

 commit 3478af3374abffa0c226ee077fda1fcfc0751e74
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Tue Jun 5 17:01:21 2012 +0100

    screen: split out screen init code. (v2)

    This is a precursor for reusing this code to init gpu screens.

    v2: fixup int check as per Keith's review.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>