diff --git a/src/KOKKOS/neighbor_kokkos.cpp b/src/KOKKOS/neighbor_kokkos.cpp
index 970e3ad0f94deb01fff25f5f41f4d0ed23fd8594..8f334415af25af5040439306c19fb5d640c5db98 100644
--- a/src/KOKKOS/neighbor_kokkos.cpp
+++ b/src/KOKKOS/neighbor_kokkos.cpp
@@ -1,4 +1,4 @@
-;/* ----------------------------------------------------------------------
+/* ----------------------------------------------------------------------
    LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
    http://lammps.sandia.gov, Sandia National Laboratories
    Steve Plimpton, sjplimp@sandia.gov
@@ -21,6 +21,11 @@
 #include "atom_masks.h"
 #include "error.h"
 #include "kokkos.h"
+#include "force.h"
+#include "bond.h"
+#include "angle.h"
+#include "dihedral.h"
+#include "improper.h"
 #include "style_nbin.h"
 #include "style_nstencil.h"
 #include "style_npair.h"
@@ -74,19 +79,6 @@ void NeighborKokkos::init()
   atomKK = (AtomKokkos *) atom;
   Neighbor::init();
 
-
-
-
-
-
-
-
-
-
-
-
-
-
   // 1st time allocation of xhold
 
   if (dist_check)
@@ -371,8 +363,8 @@ void NeighborKokkos::init_topology() {
    normally built with pair lists, but USER-CUDA separates them
 ------------------------------------------------------------------------- */
 
-void NeighborKokkos::build_topology_kokkos() {
-  if (nlist_device) {
+void NeighborKokkos::build_topology() {
+  if (device_flag) {
     neighbond_device.build_topology_kk();
 
     k_bondlist = neighbond_device.k_bondlist;
@@ -419,4 +411,4 @@ void NeighborKokkos::build_topology_kokkos() {
     k_dihedrallist.modify<LMPHostType>();
     k_improperlist.modify<LMPHostType>();
   }
-}
\ No newline at end of file
+}