Fix lib/include variable names
Another attempt to fix linking