Issues with fglrx and Sid's X.org

[Ciro Mattia Gonano <ciro at winged dot it>]

Since I upgraded X to X.org in Sid, I keep having issues with fglrx
module (actually I've not been able to use it, fallbacking on radeon).

Compile from source (with dpkg-buildpackage) fails on panel compile
with:
===
make[1]: Entering directory
`/usr/src/fglrx/fglrx-installer-8.14.13/extra_src/panel'
gcc -c -g -O2 -fno-strength-reduce -funsigned-char -Dlinux
-DFGLRX_USE_XEXTENSIONS -DFGLRX_OGL_INFO -DQT_NO_STL
-I/usr/X11R6/include -I. -I./include_dummy FGLRXExtensions.c
FGLRXExtensions.c:19:37: error: X11/extensions/xf86misc.h: No such file
or directory
FGLRXExtensions.c:20:39: error: X11/extensions/xf86mscstr.h: No such
file or directory
===

Symlinking xmiscstr.h to required headers won't fix the problem, cause
compile still fails after searching xf86vmode.h; xf86* headers don't
appear to be available in the new x-static-dev package.
Any hint? Have I to use some compat library?

Still, even installing from packages (via APT sourcing from
http://www.stanchina.net/~flavio/debian-fglrx-xorg) doesn't do the
trick, 'cause module compiling fails with:

===
make[2]: Entering directory `/usr/src/linux-source-2.6.12'
  CC [M]  /usr/src/modules/fglrx/agp3.o
  CC [M]  /usr/src/modules/fglrx/nvidia-agp.o
/usr/src/modules/fglrx/nvidia-agp.c:57: error: static declaration of
'__fgl_agp_try_unsupported' follows non-static declaration
/usr/src/modules/fglrx/agp_backend.h:92: error: previous declaration of
'__fgl_agp_try_unsupported' was here
make[3]: *** [/usr/src/modules/fglrx/nvidia-agp.o] Error 1
make[2]: *** [_module_/usr/src/modules/fglrx] Error 2
make[2]: Leaving directory `/usr/src/linux-source-2.6.12'
make[1]: *** [build] Error 2
make[1]: Leaving directory `/usr/src/modules/fglrx'
Module /usr/src/modules/fglrx failed.
===

I'm compiling against a Debian-patched 2.6.12 source (package); with the
old 2.6.11 it does the same.
Again, any hint?

-- 
Ciro Mattia Gonano
  Winged.it Master           - http://www.winged.it
  FlyingCircus.it member     - http://www.flyingcircus.it
    GPG Keynumber: DEF86925 --- ICQ#: 52631406