further work towards sharing structures/code between C++ and OpenCL
(could break the build in C++/OpenCL)