sample code in gcc/cmake tutorial does not compile (Bug #2588)

Platform: Fedora 17 with OpenCV 2.3.1 packages installed from Fedora's yum repositories.

Tutorial location:
http://docs.opencv.org/trunk/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.html

I'm not sure if this is a general thing, or specific to the way Fedora has set up their packaged OpenCV installation, but the following #includes in the sample code do not compile for me:

#include <cv.h>
#include <highgui.h>

I am an OpenCV newbie, and also not very experienced with C++, so the fix was not immediately obvious to me as is might be to a more experienced C++ programmer. It took me a couple of days to figure out that I should change the #includes to:

#include <opencv2/opencv.hpp>

If this change is generally applicable, perhaps a small edit to the tutorial content would help other newbies. On the other hand, if this is just because of the way Fedora arranges it's installation of OpenCV include files, then ....?

I asked a question in the forum before I figured out the answer. It is at:
http://answers.opencv.org/question/4720/having-trouble-compiling-one-of-the-opencv/