diff --git a/CMakeLists.txt b/CMakeLists.txt
index da11ae6..c10e5fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,8 @@ else()
 endif()
 
 include_directories(include)
-set(BINT_SRC src/Bint.cpp)
+aux_source_directory(src/Bint BINT_SRC)
+set(BINT_SRC ${BINT_SRC} src/Bint.cpp)
 set(MATH_SRC src/Math.cpp)
 add_library(shareobjects OBJECT ${BINT_SRC} ${MATH_SRC})
 
diff --git a/src/Bint.cpp b/src/Bint.cpp
index 5ecfc4b..c8b1c22 100644
--- a/src/Bint.cpp
+++ b/src/Bint.cpp
@@ -24,13 +24,6 @@
  */
 
 #include <Bint/Bint.h>
-
-#include "Bint/arithmetics.cpp"
-#include "Bint/comparison.cpp"
-#include "Bint/bitoperations.cpp"
-#include "Bint/shifts.cpp"
-#include "Bint/io.cpp"
-
 #include <stdexcept>
 
 
diff --git a/src/Bint/arithmetics.cpp b/src/Bint/arithmetics.cpp
index c0ee9f7..cad5c9b 100644
--- a/src/Bint/arithmetics.cpp
+++ b/src/Bint/arithmetics.cpp
@@ -23,6 +23,7 @@
  * SOFTWARE.
  */
 
+#include <Bint/Bint.h>
 
 namespace TigerTV {
 
diff --git a/src/Bint/bitoperations.cpp b/src/Bint/bitoperations.cpp
index 984c791..003c260 100644
--- a/src/Bint/bitoperations.cpp
+++ b/src/Bint/bitoperations.cpp
@@ -23,6 +23,7 @@
  * SOFTWARE.
  */
 
+#include <Bint/Bint.h>
 
 namespace TigerTV {
 
diff --git a/src/Bint/comparison.cpp b/src/Bint/comparison.cpp
index a428022..ea87a8a 100644
--- a/src/Bint/comparison.cpp
+++ b/src/Bint/comparison.cpp
@@ -23,6 +23,7 @@
  * SOFTWARE.
  */
 
+#include <Bint/Bint.h>
 
 namespace TigerTV {
 
diff --git a/src/Bint/io.cpp b/src/Bint/io.cpp
index 3664fb5..895f8e4 100644
--- a/src/Bint/io.cpp
+++ b/src/Bint/io.cpp
@@ -24,7 +24,7 @@
  */
 
 #include <algorithm>
-
+#include <Bint/Bint.h>
 
 namespace TigerTV {
 
diff --git a/src/Bint/shifts.cpp b/src/Bint/shifts.cpp
index faa6c83..ed0e550 100644
--- a/src/Bint/shifts.cpp
+++ b/src/Bint/shifts.cpp
@@ -23,6 +23,7 @@
  * SOFTWARE.
  */
 
+#include <Bint/Bint.h>
 
 namespace TigerTV {