I think it's safest to only have one set of openGL headers on your system. The correct place to put them is /usr/include/GL but XFree86 and xorg put them in /usr/X11R6/include/GL so the fudge solution I prefer is to make /usr/include/GL a symbolic link pointing at /usr/X11R6/include/GL, which I think the X installer does automatically. If not then
ln -sf /usr/X11R6/include/GL /usr/include/GL
When you run the Nvidia installer it installs the headers in /usr/share/doc/NVIDIA_GLX-1.0/include/GL so copy them from there into /usr/X11R6/include/GL
The current version of the Nvidia installer is available
here. Usefull info about Nvidia OpenGL is available
here