diff --git a/Makefile b/Makefile
index 97788a1..274e2d4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ endif
 SRC_C   = $(wildcard src/*.c)
 SRC_CXX = $(wildcard src/*.cpp)
 
-INCLUDE=include
+INCLUDE=include src/internal
 
 COMMON_FLAGS= -W -Wall -Wextra -Wstrict-aliasing -fno-strict-aliasing "-D_VERSION=$(VERSION)" $(addprefix -I,$(INCLUDE))
 
diff --git a/include/rng.h b/include/rng.h
index 1df12e8..7b193b0 100644
--- a/include/rng.h
+++ b/include/rng.h
@@ -6,7 +6,7 @@
 
 #include <climits>
 
-#include "common.h"
+#include "rng/common.h"
 
 #define CTOR_COPY(name) name(const name& copy)
 #define CTOR_MOVE(name) name(name&& move)
diff --git a/include/common.h b/include/rng/common.h
similarity index 96%
rename from include/common.h
rename to include/rng/common.h
index bcc1d01..cc49478 100644
--- a/include/common.h
+++ b/include/rng/common.h
@@ -1,5 +1,5 @@
-#ifndef _INTS_H
-#define _INTS_H
+#ifndef _RNG__COMMON_H
+#define _RNG__COMMON_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -69,4 +69,4 @@ typedef uintptr_t ptr_t;
 }
 #endif
 
-#endif /* _INTS_H */
+#endif /* _RNG__COMMON_H */
diff --git a/src/internal/common.h b/src/internal/common.h
new file mode 120000
index 0000000..25c7947
--- /dev/null
+++ b/src/internal/common.h
@@ -0,0 +1 @@
+../../include/rng/common.h
\ No newline at end of file
diff --git a/include/mem.h b/src/internal/mem.h
similarity index 100%
rename from include/mem.h
rename to src/internal/mem.h
diff --git a/include/range.h b/src/internal/range.h
similarity index 100%
rename from include/range.h
rename to src/internal/range.h