diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index 59a32857cb..22076dbe5f 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -41,7 +41,7 @@
 #ifndef POLARSSL_BN_MUL_H
 #define POLARSSL_BN_MUL_H
 
-#include "polarssl/config.h"
+#include "config.h"
 
 #if defined(POLARSSL_HAVE_ASM)
 
diff --git a/include/polarssl/cipher_wrap.h b/include/polarssl/cipher_wrap.h
index 891382abf0..1638c246e4 100644
--- a/include/polarssl/cipher_wrap.h
+++ b/include/polarssl/cipher_wrap.h
@@ -27,8 +27,8 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "polarssl/config.h"
-#include "polarssl/cipher.h"
+#include "config.h"
+#include "cipher.h"
 
 #ifndef POLARSSL_CIPHER_WRAP_H
 #define POLARSSL_CIPHER_WRAP_H
diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h
index b1758b875d..263c9399a7 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -27,8 +27,8 @@
 #ifndef SSL_DEBUG_H
 #define SSL_DEBUG_H
 
-#include "polarssl/config.h"
-#include "polarssl/ssl.h"
+#include "config.h"
+#include "ssl.h"
 
 #if defined(POLARSSL_DEBUG_MSG) && defined(POLARSSL_DEBUG_C)
 
diff --git a/include/polarssl/dhm.h b/include/polarssl/dhm.h
index 94ad0158d7..1cbfc6c246 100644
--- a/include/polarssl/dhm.h
+++ b/include/polarssl/dhm.h
@@ -27,7 +27,7 @@
 #ifndef POLARSSL_DHM_H
 #define POLARSSL_DHM_H
 
-#include "polarssl/bignum.h"
+#include "bignum.h"
 
 /*
  * DHM Error codes
diff --git a/include/polarssl/md_wrap.h b/include/polarssl/md_wrap.h
index a936e61710..b6640bdfe0 100644
--- a/include/polarssl/md_wrap.h
+++ b/include/polarssl/md_wrap.h
@@ -27,8 +27,8 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "polarssl/config.h"
-#include "polarssl/md.h"
+#include "config.h"
+#include "md.h"
 
 #ifndef POLARSSL_MD_WRAP_H
 #define POLARSSL_MD_WRAP_H
diff --git a/include/polarssl/openssl.h b/include/polarssl/openssl.h
index 4423857d06..62609a2973 100644
--- a/include/polarssl/openssl.h
+++ b/include/polarssl/openssl.h
@@ -30,10 +30,10 @@
 #ifndef POLARSSL_OPENSSL_H
 #define POLARSSL_OPENSSL_H
 
-#include "polarssl/aes.h"
-#include "polarssl/md5.h"
-#include "polarssl/rsa.h"
-#include "polarssl/sha1.h"
+#include "aes.h"
+#include "md5.h"
+#include "rsa.h"
+#include "sha1.h"
 
 #define AES_SIZE                16
 #define AES_BLOCK_SIZE          16
diff --git a/include/polarssl/padlock.h b/include/polarssl/padlock.h
index 08fbe825c9..ce13570777 100644
--- a/include/polarssl/padlock.h
+++ b/include/polarssl/padlock.h
@@ -27,7 +27,7 @@
 #ifndef POLARSSL_PADLOCK_H
 #define POLARSSL_PADLOCK_H
 
-#include "polarssl/aes.h"
+#include "aes.h"
 
 #define POLARSSL_ERR_PADLOCK_DATA_MISALIGNED               -0x0030  /**< Input data should be aligned. */
 
diff --git a/include/polarssl/pkcs11.h b/include/polarssl/pkcs11.h
index 8e2a8ceedc..07da0de16f 100644
--- a/include/polarssl/pkcs11.h
+++ b/include/polarssl/pkcs11.h
@@ -30,11 +30,11 @@
 #ifndef PKCS11_H_
 #define PKCS11_H_
 
-#include "polarssl/config.h"
+#include "config.h"
 
 #if defined(POLARSSL_PKCS11_C)
 
-#include "polarssl/x509.h"
+#include "x509.h"
 
 #include <pkcs11-helper-1.0/pkcs11h-certificate.h>
 
diff --git a/include/polarssl/rsa.h b/include/polarssl/rsa.h
index bbfe77dd8a..c9ecbcd323 100644
--- a/include/polarssl/rsa.h
+++ b/include/polarssl/rsa.h
@@ -27,7 +27,7 @@
 #ifndef POLARSSL_RSA_H
 #define POLARSSL_RSA_H
 
-#include "polarssl/bignum.h"
+#include "bignum.h"
 
 /*
  * RSA Error codes
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index c39c7629d6..45cb1cc030 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -29,16 +29,16 @@
 
 #include <time.h>
 
-#include "polarssl/net.h"
-#include "polarssl/dhm.h"
-#include "polarssl/rsa.h"
-#include "polarssl/md5.h"
-#include "polarssl/sha1.h"
-#include "polarssl/x509.h"
-#include "polarssl/config.h"
+#include "net.h"
+#include "dhm.h"
+#include "rsa.h"
+#include "md5.h"
+#include "sha1.h"
+#include "x509.h"
+#include "config.h"
 
 #if defined(POLARSSL_PKCS11_C)
-#include "polarssl/pkcs11.h"
+#include "pkcs11.h"
 #endif
 
 #if defined(_MSC_VER) && !defined(inline)
diff --git a/include/polarssl/version.h b/include/polarssl/version.h
index 03a55ce065..a12fdd1f7e 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -31,7 +31,7 @@
 #ifndef POLARSSL_VERSION_H
 #define POLARSSL_VERSION_H
 
-#include "polarssl/config.h"
+#include "config.h"
 
 /**
  * The version number x.y.z is split into three parts.
diff --git a/include/polarssl/x509.h b/include/polarssl/x509.h
index b0b05a7289..a2d5440848 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -27,8 +27,8 @@
 #ifndef POLARSSL_X509_H
 #define POLARSSL_X509_H
 
-#include "polarssl/rsa.h"
-#include "polarssl/dhm.h"
+#include "rsa.h"
+#include "dhm.h"
 
 /** 
  * \addtogroup x509_module