diff --git a/src/MAKE/Makefile.mpi b/src/MAKE/Makefile.mpi
index 9497fc7c92ccf385b3e79e512b671f817556227a..c88985f3367163e3c5b940e631616277a486e073 100755
--- a/src/MAKE/Makefile.mpi
+++ b/src/MAKE/Makefile.mpi
@@ -74,8 +74,8 @@ include	Makefile.package
 
 EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
+EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
 EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
 
 # Path to src files
diff --git a/src/MAKE/Makefile.serial b/src/MAKE/Makefile.serial
index efc5fed75554cccb74f19be773bc3cac07265caa..47e347264900ff8ae25829d85fc4ddf50a3fc824 100755
--- a/src/MAKE/Makefile.serial
+++ b/src/MAKE/Makefile.serial
@@ -74,8 +74,8 @@ include	Makefile.package
 
 EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_CCP_DEPENDS = $(PKG_CPP_DEPENDS)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
+EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
 EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
 
 # Path to src files
diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_cuda b/src/MAKE/OPTIONS/Makefile.kokkos_cuda
index 26197ac5b21d64236f67f27eb2b60195b1d81c66..e2e911801c7244afb70a6103ed7cd676819c38a2 100755
--- a/src/MAKE/OPTIONS/Makefile.kokkos_cuda
+++ b/src/MAKE/OPTIONS/Makefile.kokkos_cuda
@@ -19,8 +19,7 @@ SIZE =		size
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SHLIBFLAGS =	-shared
-CUDA =		yes
-OMP =		yes
+KOKKOS_DEVICES = Cuda
 
 # ---------------------------------------------------------------------
 # LAMMPS-specific settings, all OPTIONAL
diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_omp b/src/MAKE/OPTIONS/Makefile.kokkos_omp
index 4a5e1b7d7f1336b20b0a6876011ef6cf364e9bde..90fc7baa587a9e09caa75fe918094b3e40356413 100644
--- a/src/MAKE/OPTIONS/Makefile.kokkos_omp
+++ b/src/MAKE/OPTIONS/Makefile.kokkos_omp
@@ -19,7 +19,7 @@ SIZE =		size
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SHLIBFLAGS =	-shared
-OMP =		yes
+KOKKOS_DEVICES = OpenMP
 
 # ---------------------------------------------------------------------
 # LAMMPS-specific settings, all OPTIONAL
diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_phi b/src/MAKE/OPTIONS/Makefile.kokkos_phi
index 452fe7d091f10ecc61a9f89947faf4af4bb7937d..62d8ce59ecb4db710ecbef399eafb48ce6930f6b 100644
--- a/src/MAKE/OPTIONS/Makefile.kokkos_phi
+++ b/src/MAKE/OPTIONS/Makefile.kokkos_phi
@@ -19,8 +19,8 @@ SIZE =		size
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SHLIBFLAGS =	-shared
-MIC =		yes
-OMP =		yes
+KOKKOS_DEVICES = OpenMP
+KOKKOS_ARCGH =  KNC
 
 # ---------------------------------------------------------------------
 # LAMMPS-specific settings, all OPTIONAL