diff --git a/src/ssl.c b/src/ssl.c
index 4f43e15c7..4c8cff91a 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -32,7 +32,6 @@
     #include <errno.h>
 #endif
 
-#include <wolfssl/ssl.h>
 #include <wolfssl/internal.h>
 #include <wolfssl/error-ssl.h>
 #include <wolfssl/wolfcrypt/coding.h>
diff --git a/src/tls.c b/src/tls.c
index e49a94386..d0e80acb4 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2006-2014 wolfSSL Inc.
  *
- * This file is part of wolfSSL.
+ * This file is part of wolfSSL. (formerly known as CyaSSL)
  *
  * wolfSSL is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-  /* Name change compatibility layer */
-#include <cyassl/ssl.h>
 
 #ifdef HAVE_CONFIG_H
     #include <config.h>
@@ -28,7 +26,7 @@
 
 #include <wolfssl/wolfcrypt/settings.h>
 
-#include <wolfssl/ssl.h>
+#include <cyassl/ssl.h>
 #include <wolfssl/internal.h>
 #include <wolfssl/error-ssl.h>
 #include <wolfssl/wolfcrypt/hmac.h>
diff --git a/tests/api.c b/tests/api.c
index 3e4f5bc70..ba5ae115a 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -34,7 +34,7 @@
 #include <cyassl/error-ssl.h>
 
 #include <stdlib.h>
-#include <cyassl/ssl.h>
+#include <cyassl/ssl.h>  /* compatibility layer */
 #include <cyassl/test.h>
 #include <tests/unit.h>
 
diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h
index f5515aa9e..43c68d620 100644
--- a/wolfssl/openssl/ssl.h
+++ b/wolfssl/openssl/ssl.h
@@ -31,9 +31,6 @@
 /* wolfssl_cyassl compatibility layer */
 #include <cyassl/ssl.h>
 
- /* wolfssl ssl.h */
-#include <wolfssl/ssl.h>
-
 #ifdef __cplusplus
     extern "C" {
 #endif
diff --git a/wolfssl/test.h b/wolfssl/test.h
index 6e4e6afac..aaccd9a27 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -8,7 +8,6 @@
 #include <assert.h>
 #include <ctype.h>
 #include <cyassl/ssl.h> /* portability layer */
-#include <wolfssl/ssl.h>
 #include <wolfssl/wolfcrypt/types.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>