diff --git a/cpu/include/neighbors.h b/cpu/include/neighbors.h
index 1c83851..32de50e 100644
--- a/cpu/include/neighbors.h
+++ b/cpu/include/neighbors.h
@@ -5,19 +5,18 @@
 #include <cstdint>
 #include <set>
 
-using namespace std;
 
 template <typename scalar_t>
-int nanoflann_neighbors(vector<scalar_t>& queries, vector<scalar_t>& supports,
-                        vector<int64_t>& neighbors_indices, vector<float>& dists, float radius,
+int nanoflann_neighbors(std::vector<scalar_t>& queries, std::vector<scalar_t>& supports,
+                        std::vector<int64_t>& neighbors_indices, std::vector<float>& dists, float radius,
                         int max_num, int mode, bool sorted);
 
 template <typename scalar_t>
-int batch_nanoflann_neighbors(vector<scalar_t>& queries, vector<scalar_t>& supports,
-                              vector<int64_t>& q_batches, vector<int64_t>& s_batches,
-                              vector<int64_t>& neighbors_indices, vector<float>& dists,
+int batch_nanoflann_neighbors(std::vector<scalar_t>& queries, std::vector<scalar_t>& supports,
+                              std::vector<int64_t>& q_batches, std::vector<int64_t>& s_batches,
+                              std::vector<int64_t>& neighbors_indices, std::vector<float>& dists,
                               float radius, int max_num, int mode, bool sorted);
 
 template <typename scalar_t>
-void nanoflann_knn_neighbors(vector<scalar_t>& queries, vector<scalar_t>& supports,
-                             vector<int64_t>& neighbors_indices, vector<float>& dists, int k);
+void nanoflann_knn_neighbors(std::vector<scalar_t>& queries, std::vector<scalar_t>& supports,
+                             std::vector<int64_t>& neighbors_indices, std::vector<float>& dists, int k);
diff --git a/cpu/src/knn.cpp b/cpu/src/knn.cpp
index 199e931..516c4c0 100644
--- a/cpu/src/knn.cpp
+++ b/cpu/src/knn.cpp
@@ -45,8 +45,8 @@ std::pair<at::Tensor, at::Tensor> dense_knn(at::Tensor support, at::Tensor query
     CHECK_CPU(support);
 
     int b = query.size(0);
-    vector<at::Tensor> batch_idx;
-    vector<at::Tensor> batch_dist;
+    std::vector<at::Tensor> batch_idx;
+    std::vector<at::Tensor> batch_dist;
     for (int i = 0; i < b; i++)
     {
         auto out_pair = _single_batch_knn(support[i], query[i], k);
diff --git a/cpu/src/neighbors.cpp b/cpu/src/neighbors.cpp
index 3a7556c..7a58945 100644
--- a/cpu/src/neighbors.cpp
+++ b/cpu/src/neighbors.cpp
@@ -5,6 +5,10 @@
 #include <chrono>
 #include <random>
 
+using std::vector;
+using std::pair;
+using std::max;
+
 template <typename scalar_t>
 int nanoflann_neighbors(vector<scalar_t>& queries, vector<scalar_t>& supports,
                         vector<int64_t>& neighbors_indices, vector<float>& dists, float radius,