diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e267b3fe71f579105a838ff259c4842ff45c04c..377f63451b882ec6c2a2b0c59838a6a88e990935 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -269,11 +269,14 @@ set(hpp_for_lib
     ${PROJECT_SOURCE_DIR}/cpp/particles/abstract_particles_input.hpp
     ${PROJECT_SOURCE_DIR}/cpp/particles/abstract_particles_output.hpp
     ${PROJECT_SOURCE_DIR}/cpp/particles/abstract_particles_system.hpp
+    ${PROJECT_SOURCE_DIR}/cpp/particles/abstract_particles_system_with_p2p.hpp
     ${PROJECT_SOURCE_DIR}/cpp/particles/alltoall_exchanger.hpp
     ${PROJECT_SOURCE_DIR}/cpp/particles/env_utils.hpp
     ${PROJECT_SOURCE_DIR}/cpp/particles/lock_free_bool_array.hpp
     ${PROJECT_SOURCE_DIR}/cpp/particles/p2p_computer_empty.hpp
     ${PROJECT_SOURCE_DIR}/cpp/particles/p2p_computer.hpp
+    ${PROJECT_SOURCE_DIR}/cpp/particles/p2p_ghost_collisions.hpp
+    ${PROJECT_SOURCE_DIR}/cpp/particles/p2p_cylinder_collisions.hpp
     ${PROJECT_SOURCE_DIR}/cpp/particles/p2p_distr_mpi.hpp
     ${PROJECT_SOURCE_DIR}/cpp/particles/p2p_tree.hpp
     ${PROJECT_SOURCE_DIR}/cpp/particles/particles_adams_bashforth.hpp
diff --git a/cpp/particles/p2p_ghost_collisions.hpp b/cpp/particles/p2p_ghost_collisions.hpp
index 95bdc9e1607805c8a3b00d67437bea02175d6331..a674f866fed61730839d42b015ab72a6030fc0e8 100644
--- a/cpp/particles/p2p_ghost_collisions.hpp
+++ b/cpp/particles/p2p_ghost_collisions.hpp
@@ -47,7 +47,7 @@ public:
     void compute_interaction(const real_number /*pos_part1*/[], real_number /*rhs_part1*/[],
                              const real_number /*pos_part2*/[], real_number /*rhs_part2*/[],
                              const real_number /*dist_pow2*/,  const real_number /*cutoff*/,
-                             const real_number /*xshift_coef*/, const real_number /*yshift_coef*/, const real_number /*zshift_coef*/) const{
+                             const real_number /*xshift_coef*/, const real_number /*yshift_coef*/, const real_number /*zshift_coef*/){
         collision_counter += 1;
     }
 
@@ -63,7 +63,7 @@ public:
         return collision_counter;
     }
 
-    void reset_collision_counter() const{
+    void reset_collision_counter(){
         collision_counter = 0;
     }
 };