diff --git a/src/include/lib3270/log.h b/src/include/lib3270/log.h
index b496006..7a69ea2 100644
--- a/src/include/lib3270/log.h
+++ b/src/include/lib3270/log.h
@@ -59,9 +59,11 @@
 
 		#ifdef DEBUG
 			#include <stdio.h>
+			#undef trace
 			#define trace( fmt, ... )	fprintf(stderr, "%s(%d) " fmt "\n", __FILE__, __LINE__, __VA_ARGS__ ); fflush(stderr);
 			#define debug( fmt, ... )	fprintf(stderr, "%s(%d) " fmt "\n", __FILE__, __LINE__, __VA_ARGS__ ); fflush(stderr);
 		#else
+			#undef trace
 			#define trace(x, ...) 		// __VA_ARGS__
 			#define debug(x, ...) 		// __VA_ARGS__
 		#endif
diff --git a/src/lib3270/ctlr.c b/src/lib3270/ctlr.c
index 0b1c8bc..4605a4d 100644
--- a/src/lib3270/ctlr.c
+++ b/src/lib3270/ctlr.c
@@ -437,7 +437,7 @@ LIB3270_EXPORT int lib3270_get_field_start(H3270 *hSession, int baddr)
 		return -1;
 
     if(baddr < 0)
-        baddr = hSession->cursor_addr;
+		baddr = hSession->cursor_addr;
 
 	sbaddr = baddr;
 	do
@@ -462,8 +462,8 @@ LIB3270_EXPORT int lib3270_get_field_len(H3270 *hSession, int baddr)
 	if (!hSession->formatted)
 		return -1;
 
-    if(baddr < 0)
-        baddr = hSession->cursor_addr;
+	if(baddr < 0)
+		baddr = hSession->cursor_addr;
 
 	addr = find_field_attribute(hSession,baddr);
 
@@ -569,8 +569,8 @@ LIB3270_EXPORT int lib3270_get_next_unprotected(H3270 *hSession, int baddr0)
 
     CHECK_SESSION_HANDLE(hSession);
 
-    if(baddr0 < 0)
-        baddr0 = hSession->cursor_addr;
+	if(baddr0 < 0)
+		baddr0 = hSession->cursor_addr;
 
 	nbaddr = baddr0;
 	do
@@ -594,7 +594,7 @@ LIB3270_EXPORT int lib3270_get_is_protected(H3270 *hSession, int baddr)
     CHECK_SESSION_HANDLE(hSession);
 
     if(baddr < 0)
-        baddr = hSession->cursor_addr;
+		baddr = hSession->cursor_addr;
 
 	int faddr = find_field_attribute(hSession,baddr);
 
diff --git a/src/plugins/hllapi/pluginmain.c b/src/plugins/hllapi/pluginmain.c
index 09030e7..967fd01 100644
--- a/src/plugins/hllapi/pluginmain.c
+++ b/src/plugins/hllapi/pluginmain.c
@@ -71,7 +71,7 @@
 
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
 
- static const gchar	  control_char	= '@';
+//  static const gchar	  control_char	= '@';
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
diff --git a/src/pw3270/actions.c b/src/pw3270/actions.c
index a5df4a6..4e427b4 100644
--- a/src/pw3270/actions.c
+++ b/src/pw3270/actions.c
@@ -41,6 +41,7 @@
  #include <lib3270/selection.h>
  #include <lib3270/trace.h>
  #include <lib3270/macros.h>
+ #include <lib3270/log.h>
  #include <stdlib.h>
 
  #ifdef DEBUG
--
libgit2 0.21.2