diff --git a/configure.ac b/configure.ac
index b5080b3..ce892d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,7 @@ AC_SUBST(PACKAGE_LEVEL,"APP_LEVEL")
 
 #--[ Set host based options ]---------------------------------------------------------------------------------------------------------------------------------
 
+CFLAGS="$CFLAGS -Wno-deprecated-declarations"
 DLL_CFLAGS=""
 DLL_FLAGS="-shared"
 SYSDLL_FLAGS="-shared"
@@ -215,8 +216,8 @@ rm -f conftest.$ac_objext conftest.err m4_ifval([$1], [conftest.$ac_ext])[]dnl
 AC_MSG_CHECKING(for GNUC visibility attribute)
 GLIB_CHECK_COMPILE_WARNINGS([AC_LANG_SOURCE([
 
-#define LIB3270_INTERNAL	extern __attribute__((visibility("hidden")))
-#define LIB3270_EXPORT		extern __attribute__((visibility("default")))
+#define LIB3270_INTERNAL	__attribute__((visibility("hidden"))) extern
+#define LIB3270_EXPORT		__attribute__((visibility("default"))) extern
 
 LIB3270_INTERNAL	void f_hidden(void);
 LIB3270_EXPORT		void f_export(void);
diff --git a/src/include/lib3270.h b/src/include/lib3270.h
index f09cad7..741276a 100644
--- a/src/include/lib3270.h
+++ b/src/include/lib3270.h
@@ -296,13 +296,13 @@
 
 	#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
 
-		#define LIB3270_INTERNAL	extern
+		#define LIB3270_INTERNAL	__hidden extern
 		#define LIB3270_EXPORT		extern
 
 	#elif defined (HAVE_GNUC_VISIBILITY)
 
-		#define LIB3270_INTERNAL	extern __attribute__((visibility("hidden")))
-		#define LIB3270_EXPORT		extern __attribute__((visibility("default")))
+		#define LIB3270_INTERNAL	__attribute__((visibility("hidden"))) extern
+		#define LIB3270_EXPORT		__attribute__((visibility("default"))) extern
 
 	#else
 
diff --git a/src/java/Makefile.in b/src/java/Makefile.in
index ada17f6..f0bbc1c 100644
--- a/src/java/Makefile.in
+++ b/src/java/Makefile.in
@@ -78,7 +78,7 @@ include $(CLASSLIBDIR)/class.mak
 
 #---[ Build options ]----------------------------------------------------------
 
-CXXFLAGS=@CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -I../include
+CXXFLAGS=@CFLAGS@ @CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -I../include
 
 PW3270_LIBS		?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270
 PW3270_CFLAGS	?= -I../include
diff --git a/src/lib3270/ft.c b/src/lib3270/ft.c
index b3efe0f..9bfa44e 100644
--- a/src/lib3270/ft.c
+++ b/src/lib3270/ft.c
@@ -349,9 +349,9 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state);
 
  	/* Build the ind$file command */
  	snprintf(op,4095,"%s%s%s",
-						(ft->flags & LIB3270_FT_OPTION_ASCII) 	? " ascii"	: "",
-						(ft->flags & LIB3270_FT_OPTION_CRLF) 	? " crlf"	: "",
-						(ft->flags & LIB3270_FT_OPTION_APPEND)	? " append"	: ""
+						(ft->flags & LIB3270_FT_OPTION_ASCII) 	? " ASCII"	: "",
+						(ft->flags & LIB3270_FT_OPTION_CRLF) 	? " CRLF"	: "",
+						(ft->flags & LIB3270_FT_OPTION_APPEND)	? " APPEND"	: ""
 			);
 
 	trace("tso=%s",hSession->options & LIB3270_OPTION_TSO ? "yes" : "No");
@@ -365,13 +365,13 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state);
 			// TSO Host
 			if(recfm > 0)
 			{
-				snconcat(op,4096," recfm(%c)",rec[recfm-1]);
+				snconcat(op,4096," RECFM(%c)",rec[recfm-1]);
 
 				if(ft->lrecl > 0)
-					snconcat(op,4096," lrecl(%d)",ft->lrecl);
+					snconcat(op,4096," LRECL(%d)",ft->lrecl);
 
 				if(ft->blksize > 0)
-					snconcat(op,4096," blksize(%d)", ft->blksize);
+					snconcat(op,4096," BLKSIZE(%d)", ft->blksize);
 			}
 
 			if(units > 0)
@@ -380,7 +380,7 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state);
 
 				if(ft->primspace > 0)
 				{
-					snconcat(op,4096," space(%d",ft->primspace);
+					snconcat(op,4096," SPACE(%d",ft->primspace);
 					if(ft->secspace)
 						snconcat(op,4096,",%d",ft->secspace);
 					snconcat(op,4096,"%s",")");
@@ -392,10 +392,10 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state);
 			// VM Host
 			if(recfm > 0)
 			{
-				snconcat(op,4096," recfm %c",rec[recfm-1]);
+				snconcat(op,4096," RECFM %c",rec[recfm-1]);
 
 				if(ft->lrecl > 0)
-					snconcat(op,4096," lrecl %d",ft->lrecl);
+					snconcat(op,4096," LRECL %d",ft->lrecl);
 
 			}
 		}
diff --git a/src/lib3270/globals.h b/src/lib3270/globals.h
index f0e09f2..eea3ecb 100644
--- a/src/lib3270/globals.h
+++ b/src/lib3270/globals.h
@@ -35,15 +35,6 @@
 #include <lib3270.h>			/* lib3270 API calls and defs */
 #include "api.h"
 
-/* From glibconfig.h */
-#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-	#define LIB3270_INTERNAL __hidden extern
-#elif defined (__GNUC__) && defined (HAVE_GNUC_VISIBILITY)
-	#define LIB3270_INTERNAL __attribute__((visibility("hidden"))) extern
-#else
-	#define LIB3270_INTERNAL
-#endif
-
 #if defined(X3270_TN3270E) && !defined(X3270_ANSI) /*[*/
 		#define X3270_ANSI	1	/* RFC2355 requires NVT mode */
 #endif /*]*/
diff --git a/src/plugins/rx3270/Makefile.in b/src/plugins/rx3270/Makefile.in
index 165b4e2..7984378 100644
--- a/src/plugins/rx3270/Makefile.in
+++ b/src/plugins/rx3270/Makefile.in
@@ -44,7 +44,7 @@ include ../../include/plugin.mak
 include $(CLASSLIBDIR)/class.mak
 
 LIBS=@REXX_LIBS@ @LIBICONV@ @DBUS_LIBS@
-CFLAGS=@REXX_CFLAGS@ @DBUS_CFLAGS@
+CFLAGS=@CFLAGS@ @REXX_CFLAGS@ @DBUS_CFLAGS@
 REXX_HOME=@REXX_HOME@
 REXXLIBDIR=@REXX_LIBDIR@
 
--
libgit2 0.21.2