diff --git a/Makefile b/Makefile
index ac788c9..4fa24ad 100644
--- a/Makefile
+++ b/Makefile
@@ -154,10 +154,13 @@ install:
 	install -m 644 $(wildcard $(INCLUDE)/*.*) $(DESTDIR)$(PREFIX)/include/
 	install -d $(DESTDIR)$(PREFIX)/include/$(PROJECT)/
 	install -m 644 $(wildcard $(INCLUDE)/$(PROJECT)/*.*) $(DESTDIR)$(PREFIX)/include/$(PROJECT)/
+	install -d $(DESTDIR)$(PREFIX)/include/$(PROJECT)/internal
+	install -m 644 $(wildcard $(INCLUDE)/$(PROJECT)/internal/*.*) $(DESTDIR)$(PREFIX)/include/$(PROJECT)/internal
 
 uninstall:
 	-rm $(DESTDIR)$(PREFIX)/lib/lib$(PROJECT).{a,so{,.*}}
 	cd $(INCLUDE) && find . -type f | xargs -I {} rm "$(DESTDIR)$(PREFIX)/include/{}"
+	-rmdir $(DESTDIR)$(PREFIX)/include/$(PROJECT)/internal
 	-rmdir $(DESTDIR)$(PREFIX)/include/$(PROJECT)
 
 $(PROJECT)-test: lib$(PROJECT).so
diff --git a/include/rngxx.h b/include/rngxx.h
index df02715..32f2c3b 100644
--- a/include/rngxx.h
+++ b/include/rngxx.h
@@ -9,7 +9,7 @@
 #ifndef _RNGXX_IMPL
 #define _RNGXX_COMMON_MINIMAL
 #endif
-#include "rngxx/common.h"
+#include "rngxx/internal/common.h"
 #ifndef _RNGXX_IMPL
 #undef _RNGXX_COMMON_MINIMAL
 #endif
diff --git a/include/rngxx/crand.h b/include/rngxx/crand.h
index 6caf385..75fdcf2 100644
--- a/include/rngxx/crand.h
+++ b/include/rngxx/crand.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../common.h"
+#include "internal/common.h"
 
 #include <rng.h>
-#include "../mem.h"
+#include "internal/mem.h"
 
 namespace rng
 {
diff --git a/include/rngxx/common.h b/include/rngxx/internal/common.h
similarity index 100%
rename from include/rngxx/common.h
rename to include/rngxx/internal/common.h
diff --git a/src/internal/mem.h b/include/rngxx/internal/mem.h
similarity index 100%
rename from src/internal/mem.h
rename to include/rngxx/internal/mem.h
diff --git a/src/internal/range.h b/include/rngxx/internal/range.h
similarity index 100%
rename from src/internal/range.h
rename to include/rngxx/internal/range.h
diff --git a/src/internal b/src/internal
new file mode 120000
index 0000000..a9e81e6
--- /dev/null
+++ b/src/internal
@@ -0,0 +1 @@
+../include/rngxx/internal
\ No newline at end of file
diff --git a/src/internal/common.h b/src/internal/common.h
deleted file mode 120000
index df8e6f3..0000000
--- a/src/internal/common.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/rngxx/common.h
\ No newline at end of file