diff --git a/src/dialogs/hostselect.c b/src/dialogs/hostselect.c
index a3ab1e3..4648974 100644
--- a/src/dialogs/hostselect.c
+++ b/src/dialogs/hostselect.c
@@ -27,9 +27,8 @@
  *
  */
 
- #include "hostselect.h"
- #include <lib3270/log.h>
- #include <v3270.h>
+ #include "private.h"
+ #include <hostselect.h>
 
 /*--[ Widget definition ]----------------------------------------------------------------------------*/
 
diff --git a/src/dialogs/private.h b/src/dialogs/private.h
new file mode 100644
index 0000000..e5bb9da
--- /dev/null
+++ b/src/dialogs/private.h
@@ -0,0 +1,39 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como private.h e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ */
+
+#include <config.h>
+
+#define ENABLE_NLS
+#define GETTEXT_PACKAGE PACKAGE_NAME
+
+#include <libintl.h>
+#include <glib/gi18n.h>
+
+#include <gtk/gtk.h>
+#include <v3270.h>
diff --git a/src/v3270/charset.c b/src/v3270/charset.c
index e09db8b..6605c86 100644
--- a/src/v3270/charset.c
+++ b/src/v3270/charset.c
@@ -27,8 +27,8 @@
  *
  */
 
- #include <v3270.h>
  #include "private.h"
+ #include <v3270.h>
  #include <lib3270/charset.h>
  #include <lib3270/log.h>
  #include <lib3270/X11keysym.h>
diff --git a/src/v3270/iocallback.c b/src/v3270/iocallback.c
index 968c343..9ef90b3 100644
--- a/src/v3270/iocallback.c
+++ b/src/v3270/iocallback.c
@@ -29,6 +29,15 @@
  *
  */
 
+ #include <config.h>
+
+ #define ENABLE_NLS
+ #define GETTEXT_PACKAGE PACKAGE_NAME
+
+ #include <gtk/gtk.h>
+ #include <libintl.h>
+ #include <glib/gi18n.h>
+
 #if defined(_WIN32) /*[*/
 	#include <windows.h>
 #elif defined(__APPLE__)
diff --git a/src/v3270/oia.c b/src/v3270/oia.c
index 90de926..8704219 100644
--- a/src/v3270/oia.c
+++ b/src/v3270/oia.c
@@ -27,17 +27,25 @@
  *
  */
 
-#ifdef WIN32
+ #include <config.h>
+
+ #define ENABLE_NLS
+ #define GETTEXT_PACKAGE PACKAGE_NAME
+
+ #include <gtk/gtk.h>
+ #include <libintl.h>
+ #include <glib/gi18n.h>
+
+ #ifdef WIN32
 	#include <winsock2.h>
 	#include <windows.h>
 	#include <ws2tcpip.h>
-#endif // WIN32
+ #endif // WIN32
 
  #include <lib3270.h>
  #include <lib3270/session.h>
  #include <lib3270/log.h>
  #include <config.h>
- #include <gtk/gtk.h>
  #include <string.h>
  #include <errno.h>
  #include <ctype.h>
diff --git a/src/v3270/security.c b/src/v3270/security.c
index cd4d05a..a28300a 100644
--- a/src/v3270/security.c
+++ b/src/v3270/security.c
@@ -27,7 +27,15 @@
  *
  */
 
+ #include <config.h>
+
+ #define ENABLE_NLS
+ #define GETTEXT_PACKAGE PACKAGE_NAME
+
  #include <gtk/gtk.h>
+ #include <libintl.h>
+ #include <glib/gi18n.h>
+
  #include "private.h"
 
  #if defined(HAVE_LIBSSL)
diff --git a/src/v3270/widget.c b/src/v3270/widget.c
index ae14259..98e7142 100644
--- a/src/v3270/widget.c
+++ b/src/v3270/widget.c
@@ -27,13 +27,21 @@
  *
  */
 
+ #include <config.h>
+
+ #define ENABLE_NLS
+ #define GETTEXT_PACKAGE PACKAGE_NAME
+
+ #include <gtk/gtk.h>
+ #include <libintl.h>
+ #include <glib/gi18n.h>
+
 #ifdef WIN32
 	#include <winsock2.h>
 	#include <windows.h>
 	#include <ws2tcpip.h>
 #endif // WIN32
 
- #include <gtk/gtk.h>
  #include <lib3270.h>
  #include <lib3270/session.h>
  #include <lib3270/actions.h>
diff --git a/src/v3270ft/load.c b/src/v3270ft/load.c
index ce009e5..008e904 100644
--- a/src/v3270ft/load.c
+++ b/src/v3270ft/load.c
@@ -29,6 +29,7 @@
  */
 
  #include "private.h"
+
  #include <ctype.h>
  #include <stdlib.h>
 
diff --git a/valgrind.suppression b/valgrind.suppression
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/valgrind.suppression
--
libgit2 0.21.2