Revert "Change some variable types to match the host side when not "using namespace std;""

This reverts commit 6455e785496338bb84d899f72bf823aa9cac2295.