#if GMX_GPU == GMX_GPU_OPENCL
struct gmx_nbnxn_ocl_t;
-typedef struct gmx_nbnxn_ocl_t gmx_nbnxn_gpu_t;
+using gmx_nbnxn_gpu_t = gmx_nbnxn_ocl_t;
#endif
#if GMX_GPU == GMX_GPU_CUDA
struct gmx_nbnxn_cuda_t;
-typedef struct gmx_nbnxn_cuda_t gmx_nbnxn_gpu_t;
+using gmx_nbnxn_gpu_t = gmx_nbnxn_cuda_t;
#endif
#if GMX_GPU == GMX_GPU_NONE