diff --git a/configure.ac b/configure.ac
index ca5fe7fb6..4ab3ca1b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,10 @@ LT_INIT([win32-dll])
 LT_LANG([C++])
 LT_LANG([C])
 gl_VISIBILITY
+AS_IF([ test -n "$CFLAG_VISIBILITY" ], [
+       AM_CPPFLAGS="$AM_CPPFLAGS $CFLAG_VISIBILITY"
+       CPPFLAGS="$CPPFLAGS $CFLAG_VISIBILITY"
+       ])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
@@ -683,7 +687,7 @@ fi])
 AX_HARDEN_CC_COMPILER_FLAGS
 
 CREATE_HEX_VERSION
-AM_CFLAGS="$AM_CFLAGS $CFLAG_VISIBILITY"
+AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_LDFLAGS)
 
diff --git a/cyassl/version.h b/cyassl/version.h
deleted file mode 100644
index 08bcd9972..000000000
--- a/cyassl/version.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* cyassl_version.h.in
- *
- * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
- *
- * This file is part of CyaSSL.
- *
- * CyaSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * CyaSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LIBCYASSL_VERSION_STRING "2.4.0"
-#define LIBCYASSL_VERSION_HEX 0x02004000
-
-#ifdef __cplusplus
-}
-#endif
-