config BR2_PACKAGE_XSERVER_XORG_SERVER
        bool "xorg-server"
+       depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_LIBPCIACCESS if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
        # We need a SHA1 implementation. If either openssl or
        # libgcrypt are already part of the build, we'll use one of
        select BR2_PACKAGE_XPROTO_XPROTO
        select BR2_PACKAGE_XUTIL_UTIL_MACROS
        select BR2_PACKAGE_XKEYBOARD_CONFIG
-       depends on BR2_USE_MMU # fork()
        help
          X.Org X server
 
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
        bool "Modular X.org"
+       depends on BR2_INSTALL_LIBSTDCPP
        select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \
                BR2_PACKAGE_XPROTO_DRI2PROTO)
-       depends on BR2_INSTALL_LIBSTDCPP
        help
          This variant of the X.org server is the full-blown variant,
          as used by desktop GNU/Linux distributions. The drivers (for