* Fixed missing C++ headers to compile in Debian 7
* Minor changes for homogeneity