diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index 4213e74f18..4848c8285f 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -18,7 +18,7 @@
 #ifndef XYSSL_BN_MUL_H
 #define XYSSL_BN_MUL_H
 
-#include "xyssl/config.h"
+#include "polarssl/config.h"
 
 #if defined(XYSSL_HAVE_ASM)
 
diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h
index 1ffb0eceec..4b1a164c42 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -4,8 +4,8 @@
 #ifndef SSL_DEBUG_H
 #define SSL_DEBUG_H
 
-#include "xyssl/config.h"
-#include "xyssl/ssl.h"
+#include "polarssl/config.h"
+#include "polarssl/ssl.h"
 
 #if defined(XYSSL_DEBUG_MSG)
 
diff --git a/include/polarssl/dhm.h b/include/polarssl/dhm.h
index 127d626cad..ebed106eb9 100644
--- a/include/polarssl/dhm.h
+++ b/include/polarssl/dhm.h
@@ -4,7 +4,7 @@
 #ifndef XYSSL_DHM_H
 #define XYSSL_DHM_H
 
-#include "xyssl/bignum.h"
+#include "polarssl/bignum.h"
 
 #define XYSSL_ERR_DHM_BAD_INPUT_DATA                    -0x0480
 #define XYSSL_ERR_DHM_READ_PARAMS_FAILED                -0x0490
diff --git a/include/polarssl/openssl.h b/include/polarssl/openssl.h
index 0006754e60..f34db57a41 100644
--- a/include/polarssl/openssl.h
+++ b/include/polarssl/openssl.h
@@ -7,10 +7,10 @@
 #ifndef XYSSL_OPENSSL_H
 #define XYSSL_OPENSSL_H
 
-#include "xyssl/aes.h"
-#include "xyssl/md5.h"
-#include "xyssl/rsa.h"
-#include "xyssl/sha1.h"
+#include "polarssl/aes.h"
+#include "polarssl/md5.h"
+#include "polarssl/rsa.h"
+#include "polarssl/sha1.h"
 
 #define AES_SIZE                16
 #define AES_BLOCK_SIZE          16
diff --git a/include/polarssl/padlock.h b/include/polarssl/padlock.h
index e577de71bb..713b155231 100644
--- a/include/polarssl/padlock.h
+++ b/include/polarssl/padlock.h
@@ -4,7 +4,7 @@
 #ifndef XYSSL_PADLOCK_H
 #define XYSSL_PADLOCK_H
 
-#include "xyssl/aes.h"
+#include "polarssl/aes.h"
 
 #if (defined(__GNUC__) && defined(__i386__))
 
diff --git a/include/polarssl/rsa.h b/include/polarssl/rsa.h
index 9a8a5dc23a..482dc0114f 100644
--- a/include/polarssl/rsa.h
+++ b/include/polarssl/rsa.h
@@ -4,7 +4,7 @@
 #ifndef XYSSL_RSA_H
 #define XYSSL_RSA_H
 
-#include "xyssl/bignum.h"
+#include "polarssl/bignum.h"
 
 #define XYSSL_ERR_RSA_BAD_INPUT_DATA                    -0x0400
 #define XYSSL_ERR_RSA_INVALID_PADDING                   -0x0410
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index d6bd0daedc..e8dbf89ebb 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -6,12 +6,12 @@
 
 #include <time.h>
 
-#include "xyssl/net.h"
-#include "xyssl/dhm.h"
-#include "xyssl/rsa.h"
-#include "xyssl/md5.h"
-#include "xyssl/sha1.h"
-#include "xyssl/x509.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"
 
 #define XYSSL_ERR_SSL_FEATURE_UNAVAILABLE               -0x1000
 #define XYSSL_ERR_SSL_BAD_INPUT_DATA                    -0x1800
diff --git a/include/polarssl/x509.h b/include/polarssl/x509.h
index 0ada355010..9d9ef99a5b 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -4,7 +4,7 @@
 #ifndef XYSSL_X509_H
 #define XYSSL_X509_H
 
-#include "xyssl/rsa.h"
+#include "polarssl/rsa.h"
 
 #define XYSSL_ERR_ASN1_OUT_OF_DATA                      -0x0014
 #define XYSSL_ERR_ASN1_UNEXPECTED_TAG                   -0x0016