diff --git a/include/Makefile b/include/Makefile
index 43f829c..2f8bd04 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -4,17 +4,17 @@ include ../common.mk
 install:
 	$(INSTALL_DIR) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"
 	$(INSTALL) ntru.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru.h
-	$(INSTALL) decrypt.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/decrypt.h
-	$(INSTALL) encrypt.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/encrypt.h
-	$(INSTALL) keypair.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/keypair.h
-	$(INSTALL) rnd.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/rnd.h
+	$(INSTALL) ntru_decrypt.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_decrypt.h
+	$(INSTALL) ntru_encrypt.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_encrypt.h
+	$(INSTALL) ntru_keypair.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_keypair.h
+	$(INSTALL) ntru_rnd.h "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_rnd.h
 
 uninstall:
 	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru.h
-	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/decrypt.h
-	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/encrypt.h
-	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/keypair.h
-	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/rnd.h
+	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_decrypt.h
+	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_encrypt.h
+	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_keypair.h
+	$(RM) "$(DESTDIR)$(INSTALL_INCLUDEDIR)"/ntru_rnd.h
 
 doc:
 	doxygen
diff --git a/include/decrypt.h b/include/ntru_decrypt.h
similarity index 97%
rename from include/decrypt.h
rename to include/ntru_decrypt.h
index 8bc2c62..841fedf 100644
--- a/include/decrypt.h
+++ b/include/ntru_decrypt.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file decrypt.h
+ * @file ntru_decrypt.h
  * This file holds the public API of decryption
  * of the pqc NTRU implementation and is
  * meant to be installed on the client system.
@@ -31,7 +31,7 @@
 #define PUBLIC_NTRU_DECRYPT_H_
 
 
-#include "ntru.h"
+#include <ntru.h>
 
 #include <fmpz_poly.h>
 #include <fmpz.h>
diff --git a/include/encrypt.h b/include/ntru_encrypt.h
similarity index 97%
rename from include/encrypt.h
rename to include/ntru_encrypt.h
index b1c0f81..6205920 100644
--- a/include/encrypt.h
+++ b/include/ntru_encrypt.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file encrypt.h
+ * @file ntru_encrypt.h
  * This file holds the public API of encryption
  * of the pqc NTRU implementation and is
  * meant to be installed on the client system.
@@ -31,7 +31,7 @@
 #define PUBLIC_NTRU_ENCRYPT_H_
 
 
-#include "ntru.h"
+#include <ntru.h>
 
 #include <fmpz_poly.h>
 #include <fmpz.h>
diff --git a/include/keypair.h b/include/ntru_keypair.h
similarity index 98%
rename from include/keypair.h
rename to include/ntru_keypair.h
index e494591..640ea04 100644
--- a/include/keypair.h
+++ b/include/ntru_keypair.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file keypair.h
+ * @file ntru_keypair.h
  * This file holds the public API of generating,
  * exporting and importing public and private keys
  * of the pqc NTRU implementation and is
@@ -31,7 +31,7 @@
 #ifndef PUBLIC_NTRU_KEYPAIR_H_
 #define PUBLIC_NTRU_KEYPAIR_H_
 
-#include "ntru.h"
+#include <ntru.h>
 
 #include <fmpz_poly.h>
 #include <fmpz.h>
diff --git a/include/rnd.h b/include/ntru_rnd.h
similarity index 98%
rename from include/rnd.h
rename to include/ntru_rnd.h
index 3524cd1..3a4027b 100644
--- a/include/rnd.h
+++ b/include/ntru_rnd.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file rnd.h
+ * @file ntru_rnd.h
  * This file holds the public API of generating
  * random ternary polynomials of the pqc NTRU
  * implementation and is meant to be installed
@@ -32,7 +32,7 @@
 #define PUBLIC_NTRU_RND_H_
 
 
-#include "ntru.h"
+#include <ntru.h>
 
 #include <fmpz_poly.h>
 #include <fmpz.h>