diff --git a/src/lib3270++/Makefile.in b/src/lib3270++/Makefile.in
index 78fea20..1237cf1 100644
--- a/src/lib3270++/Makefile.in
+++ b/src/lib3270++/Makefile.in
@@ -29,7 +29,8 @@
 LIBNAME=lib@LIB3270_NAME@++
 
 SOURCES= \
-	$(wildcard *.cc)
+	$(wildcard *.cc) \
+	$(wildcard local/*.cc) \
 
 TEST_SOURCES= \
 	$(wildcard testprogram/*.cc)
@@ -198,6 +199,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
 		-o $@ \
 		$(LDFLAGS) \
 		$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \
+		-L$(BINRLS) \
 		$(LIBS)
 
 $(BINRLS)/$(LIBNAME).a: \
@@ -288,7 +290,12 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \
 
 	@$(MKDIR) `dirname $@`
 	@echo $< ...
-	$(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
+	@$(LD) \
+		-Wl,--rpath,$(BINDBG) \
+		-o $@ \
+		$^ \
+		$(LDFLAGS) \
+		$(LIBS)
 
 run: \
 	$(BINDBG)/$(LIBNAME)@EXEEXT@
@@ -330,11 +337,15 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
 	@$(MKDIR) `dirname $@`
 	@echo $< ...
 	@$(LD) \
-		-shared -Wl,-soname,$(@F) \
+		-shared \
+		-Wl,-soname,$(@F) \
+		-Wl,--rpath,$(BINDBG) \
 		-o $@ \
 		$(LDFLAGS) \
 		$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \
-		$(LIBS)
+		-L$(BINDBG) \
+		$(LIBS) \
+		-l3270
 
 #---[ Clean Targets ]--------------------------------------------------------------------
 
diff --git a/src/lib3270++/lib3270++.cbp b/src/lib3270++/lib3270++.cbp
index bf67e08..2b6f978 100644
--- a/src/lib3270++/lib3270++.cbp
+++ b/src/lib3270++/lib3270++.cbp
@@ -3,6 +3,7 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="C++ Bindings for lib3270" />
+		<Option makefile_is_custom="1" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
diff --git a/src/lib3270++/local/events.cc b/src/lib3270++/local/events.cc
index 597dca0..4d6c5ad 100644
--- a/src/lib3270++/local/events.cc
+++ b/src/lib3270++/local/events.cc
@@ -50,7 +50,7 @@
  namespace TN3270 {
 
 	/// @brief Popup Handler.
-	int Local::Session::popupHandler(H3270 *h3270, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list arg) {
+	void Local::Session::popupHandler(H3270 *h3270, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list arg) {
 
 		Local::Session * session = (Local::Session *) lib3270_get_user_data(h3270);
 
@@ -100,8 +100,6 @@
 
         session->fire(PopupEvent(type,title,msg,fmt,arg));
 
-        return 0;
-
 	}
 
 	/// @brief Connect Handler.
diff --git a/src/lib3270++/private.h b/src/lib3270++/private.h
index 0bbd92c..d8b285d 100644
--- a/src/lib3270++/private.h
+++ b/src/lib3270++/private.h
@@ -113,7 +113,7 @@
 				std::mutex sync;
 
 				/// @brief Popup Handler.
-				static int popupHandler(H3270 *session, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list arg);
+				static void popupHandler(H3270 *session, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list arg);
 
 				/// @brief Connect Handler.
 				static void connectHandler(H3270 *session, unsigned char connected);
diff --git a/src/lib3270++/valgrind.suppression b/src/lib3270++/valgrind.suppression
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/lib3270++/valgrind.suppression
--
libgit2 0.21.2