diff --git a/src/USER-CUDA/cuda.cpp b/src/USER-CUDA/cuda.cpp
index b86908323d..ab5547f38d 100644
--- a/src/USER-CUDA/cuda.cpp
+++ b/src/USER-CUDA/cuda.cpp
@@ -34,7 +34,9 @@
 #include "neigh_list.h"
 #include "universe.h"
 #include "input.h"
+#include "atom_masks.h"
 #include "error.h"
+
 #include "cuda_neigh_list.h"
 //#include "pre_binning_cu.h"
 #include "binning_cu.h"
diff --git a/src/USER-CUDA/fix_aveforce_cuda.cpp b/src/USER-CUDA/fix_aveforce_cuda.cpp
index f000996669..8c332ee8a8 100644
--- a/src/USER-CUDA/fix_aveforce_cuda.cpp
+++ b/src/USER-CUDA/fix_aveforce_cuda.cpp
@@ -30,13 +30,14 @@
 #include "atom.h"
 #include "update.h"
 #include "respa.h"
-#include "error.h"
 #include "domain.h"
 #include "cuda.h"
 #include "cuda_modify_flags.h"
 #include "variable.h"
 #include "input.h"
 #include "modify.h"
+#include "atom_masks.h"
+#include "error.h"
 
 
 using namespace LAMMPS_NS;
diff --git a/src/USER-CUDA/verlet_cuda.cpp b/src/USER-CUDA/verlet_cuda.cpp
index ba6289c773..9cdba7c483 100644
--- a/src/USER-CUDA/verlet_cuda.cpp
+++ b/src/USER-CUDA/verlet_cuda.cpp
@@ -948,8 +948,7 @@ void VerletCuda::run(int n)
       timer->stamp(TIME_PAIR);
 
       if(neighbor->lastcall == update->ntimestep) {
-        neighbor->build_bonded();
-
+        neighbor->build_topology();
         timer->stamp(TIME_NEIGHBOR);
       }