fglrx, kernel 2.6.20, dri and composite problem

Hi all,

I was running happily Debian Unstable for 3 years, when finally my hard
drive died, and I had to install Debian from scratch. I want to install
beryl

http://wiki.beryl-project.org/wiki/Install/Debian

Very nice outlook which obviously requires 3D acceleration and (as
outlined on the page above) the
option:

Section "Extensions"
Option "Composite" "Enable"
EndSection

I tried kernels 2.6.19 and 2.6.20 with the latest ati drivers (8.33.6-1)
and the ones included in Debian (2.28.8). In a short what I did is:

# ln -sf bash /bin/sh
# bash ./ati-driver-installer-8.33.6-x86.x86_64.run --buildpkg
Debian/unstable
# dpkg -i *.deb
# cd /usr/src
# tar -jxvf fglrx.tar.bz2
# cd /usr/src/modules/fglrx/
# module-assistant prepare
# module-assistant a-i fglrx
restarting x...

===> kernel 2.6.20 (with both driver versions), the module cannot
compile at all, complaining about

.....
/usr/src/modules/fglrx/firegl_public.c:198: error: expected declaration
specifiers or \u2018...\u2019 before \u2018mlock\u2019
/usr/src/modules/fglrx/firegl_public.c:198: error: expected declaration
specifiers or \u2018...\u2019 before \u2018addr\u2019 ...
......

===> kernel 2.6.19 (with both driver versions), 3D acceleration works if

Section "Extensions"
Option "Composite" "Disable"
EndSection

But if I enable it I get:

% fglrxinfo
Xlib: extension "XFree86-DRI" missing on display ":0.0".
display: :0.0 screen: 0
OpenGL vendor string: Mesa project: www.mesa3d.org
OpenGL renderer string: Mesa GLX Indirect
OpenGL version string: 1.2 (1.5 Mesa 6.5.1)

% glxgears
Xlib: extension "XFree86-DRI" missing on display ":0.0".

Any idea how to solve this? Nothing useful in google..

Cheers,
Ivan

P.S. Attached are /etc/X11/xorg.conf and /var/log/Xorg.0.log