diff --git a/ctaocrypt/test/test.c b/ctaocrypt/test/test.c
index fdddac91f..3efae3150 100644
--- a/ctaocrypt/test/test.c
+++ b/ctaocrypt/test/test.c
@@ -118,7 +118,7 @@ void err_sys(const char* msg, int es)
 #endif
 }
 
-/* func_args from cyassl_test.h, so don't have to pull in other junk */
+/* func_args from test.h, so don't have to pull in other junk */
 typedef struct func_args {
     int    argc;
     char** argv;
diff --git a/cyassl/openssl/cyassl_callbacks.h b/cyassl/callbacks.h
similarity index 100%
rename from cyassl/openssl/cyassl_callbacks.h
rename to cyassl/callbacks.h
diff --git a/cyassl/include.am b/cyassl/include.am
index 95b146c04..30e5976b0 100644
--- a/cyassl/include.am
+++ b/cyassl/include.am
@@ -12,4 +12,6 @@ nobase_include_HEADERS+= \
                          cyassl/internal.h \
                          cyassl/sniffer_error.h \
                          cyassl/sniffer.h \
+                         cyassl/callbacks.h \
+                         cyassl/test.h \
                          cyassl/version.h
diff --git a/cyassl/openssl/include.am b/cyassl/openssl/include.am
index a352683e0..c2c3a6ee4 100644
--- a/cyassl/openssl/include.am
+++ b/cyassl/openssl/include.am
@@ -7,8 +7,6 @@ nobase_include_HEADERS+= \
                          cyassl/openssl/bn.h \
                          cyassl/openssl/conf.h \
                          cyassl/openssl/crypto.h \
-                         cyassl/openssl/cyassl_callbacks.h \
-                         cyassl/openssl/cyassl_test.h \
                          cyassl/openssl/des.h \
                          cyassl/openssl/dh.h \
                          cyassl/openssl/dsa.h \
diff --git a/cyassl/openssl/cyassl_test.h b/cyassl/test.h
similarity index 99%
rename from cyassl/openssl/cyassl_test.h
rename to cyassl/test.h
index eefb1b041..d3ee6ca9a 100644
--- a/cyassl/openssl/cyassl_test.h
+++ b/cyassl/test.h
@@ -1,4 +1,4 @@
-/* cyassl_test.h */
+/* test.h */
 
 #ifndef CyaSSL_TEST_H
 #define CyaSSL_TEST_H
diff --git a/cyassl/version.h.in b/cyassl/version.h.in
index 979a5b6aa..6af4f0ae5 100644
--- a/cyassl/version.h.in
+++ b/cyassl/version.h.in
@@ -1,4 +1,4 @@
-/* cyassl_version.h
+/* cyassl_version.h.in
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *
diff --git a/examples/client/client.c b/examples/client/client.c
index 2f7c5c15c..58cc257cf 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -24,7 +24,7 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/openssl/cyassl_test.h>
+#include <cyassl/test.h>
 
 /*
 #define TEST_RESUME 
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index 29a0809ef..7f9ef8383 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -24,7 +24,7 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/openssl/cyassl_test.h>
+#include <cyassl/test.h>
 
 
 void echoclient_test(void* args)
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index ed7cc5621..329dc20dc 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -24,7 +24,7 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/openssl/cyassl_test.h>
+#include <cyassl/test.h>
 
 #ifndef NO_MAIN_DRIVER
     #define ECHO_OUT
diff --git a/examples/server/server.c b/examples/server/server.c
index bfeb41401..210aac27a 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -24,7 +24,7 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/openssl/cyassl_test.h>
+#include <cyassl/test.h>
 
 
 #ifdef CYASSL_CALLBACKS
diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index 83e2dde33..9e22f7475 100644
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -24,7 +24,7 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/openssl/cyassl_test.h>
+#include <cyassl/test.h>
 #include <cyassl/ctaocrypt/md5.h>
 
 #ifdef SINGLE_THREADED