-#include "../nbnxn_consts.h"
-#include "gromacs/legacyheaders/gmx_detect_hardware.h"
-
-#include "nbnxn_cuda_types.h"
-#include "../../gmxlib/cuda_tools/cudautils.cuh"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.h"
-#include "gromacs/legacyheaders/pmalloc_cuda.h"
-#include "gromacs/legacyheaders/gpu_utils.h"
-
+#include "gromacs/legacyheaders/types/interaction_const.h"
+#include "gromacs/mdlib/nb_verlet.h"
+#include "gromacs/mdlib/nbnxn_consts.h"