diff --git a/include/layers/conv.h b/include/layers/conv.cuh
similarity index 100%
rename from include/layers/conv.h
rename to include/layers/conv.cuh
diff --git a/include/layers/dense.h b/include/layers/dense.cuh
similarity index 97%
rename from include/layers/dense.h
rename to include/layers/dense.cuh
index a35f157..cd002fd 100644
--- a/include/layers/dense.h
+++ b/include/layers/dense.cuh
@@ -3,7 +3,7 @@
 
 #include <vector>
 #include <cublas_v2.h>
-#include <ilayer.h>
+#include <ilayer.cuh>
 
 namespace Layers {
 
diff --git a/include/layers/ilayer.h b/include/layers/ilayer.cuh
similarity index 100%
rename from include/layers/ilayer.h
rename to include/layers/ilayer.cuh
diff --git a/include/utils/cuda_helper.h b/include/utils/cuda_helper.cuh
similarity index 100%
rename from include/utils/cuda_helper.h
rename to include/utils/cuda_helper.cuh
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2c7d52c..bbf5f52 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,5 +2,6 @@ set(LAYER_SOURCES layers/dense.cu)
 
 add_library(CUDANet
     utils/cuda_helper.cu
+    utils/functions.cu
     ${LAYER_SOURCES}
 )
diff --git a/src/layers/dense.cu b/src/layers/dense.cu
index a547b20..86f3328 100644
--- a/src/layers/dense.cu
+++ b/src/layers/dense.cu
@@ -1,5 +1,5 @@
-#include "dense.h"
-#include "cuda_helper.h"
+#include "dense.cuh"
+#include "cuda_helper.cuh"
 #include <cstdlib>
 #include <cuda_runtime.h>
 #include <cublas_v2.h>
diff --git a/src/utils/cuda_helper.cu b/src/utils/cuda_helper.cu
index 9c6e5b8..6ba2a9a 100644
--- a/src/utils/cuda_helper.cu
+++ b/src/utils/cuda_helper.cu
@@ -1,6 +1,6 @@
 #include <cstdio>
 #include <cstdlib>
-#include "cuda_helper.h"
+#include "cuda_helper.cuh"
 #include <cuda_runtime.h>
 #include <cublas_v2.h>
 
diff --git a/test/layers/test_dense.cu b/test/layers/test_dense.cu
index bad3793..226d03b 100644
--- a/test/layers/test_dense.cu
+++ b/test/layers/test_dense.cu
@@ -2,8 +2,8 @@
 #include <cuda_runtime_api.h>
 #include <driver_types.h>
 #include <iostream>
-#include "dense.h"
-#include "test_cublas_fixture.h"
+#include "dense.cuh"
+#include "test_cublas_fixture.cuh"
 
 class DenseLayerTest : public CublasTestFixture {
 protected:
diff --git a/test/test_utils/test_cublas_fixture.cu b/test/test_utils/test_cublas_fixture.cu
index ad1a604..7403cf5 100644
--- a/test/test_utils/test_cublas_fixture.cu
+++ b/test/test_utils/test_cublas_fixture.cu
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 #include "cublas_v2.h"
-#include "test_cublas_fixture.h"
+#include "test_cublas_fixture.cuh"
 
 cublasHandle_t CublasTestFixture::cublasHandle;
 
diff --git a/test/test_utils/test_cublas_fixture.h b/test/test_utils/test_cublas_fixture.cuh
similarity index 100%
rename from test/test_utils/test_cublas_fixture.h
rename to test/test_utils/test_cublas_fixture.cuh