Fix CMake problem that I fixed in the master branch earlier
Do not use "using" in header files