diff --git a/client/lib3270++.cbp b/client/lib3270++.cbp
index e83b784..ba6ca38 100644
--- a/client/lib3270++.cbp
+++ b/client/lib3270++.cbp
@@ -2,7 +2,7 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="C++ Bindings for lib3270" />
+		<Option title="IPC Client library for lib3270/pw3270" />
 		<Option makefile_is_custom="1" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
@@ -53,10 +53,6 @@
 		<Unit filename="src/core/windows/resources.rc.in" />
 		<Unit filename="src/core/windows/session.cc" />
 		<Unit filename="src/include/ipc-client-internals.h" />
-		<Unit filename="src/os/linux/request.cc" />
-		<Unit filename="src/os/linux/session.cc" />
-		<Unit filename="src/os/windows/request.cc" />
-		<Unit filename="src/os/windows/session.cc" />
 		<Unit filename="src/session/local/events.cc" />
 		<Unit filename="src/session/local/session.cc" />
 		<Unit filename="src/session/remote/session.cc" />
diff --git a/client/src/session/local/session.cc b/client/src/session/local/session.cc
index f9c001d..15a7369 100644
--- a/client/src/session/local/session.cc
+++ b/client/src/session/local/session.cc
@@ -36,6 +36,15 @@
  *
  */
 
+ #ifdef _WIN32
+
+	#include <winsock2.h>
+	#include <windows.h>
+	#include <lmcons.h>
+	#include <libloaderapi.h>
+
+ #endif // _WIN32
+
  #include <ipc-client-internals.h>
  #include <lib3270/actions.h>
  #include <lib3270/properties.h>
@@ -45,6 +54,8 @@
 
  extern "C" {
 	 #include <lib3270/session.h>
+
+
  }
 
  using std::string;
@@ -53,10 +64,138 @@
 
  namespace TN3270 {
 
+ #ifdef _WIN32
+	static void write_log(const char *msg, int rc = (int) GetLastError()) {
+
+		HANDLE hEventLog = RegisterEventSource(NULL, PACKAGE_NAME);
+
+		if(hEventLog) {
+
+			char	username[UNLEN + 1];
+			DWORD	szName = sizeof(username);
+
+			memset(username,0,szName);
+
+			if(!GetUserName(username, &szName)) {
+				strncpy(username,"?",UNLEN);
+			}
+
+			char lasterror[1024];
+			snprintf(lasterror,sizeof(lasterror),"The error code was %d",rc);
+
+			const char *outMsg[] = {
+				username,
+				msg,
+				lasterror
+			};
+
+			ReportEvent(
+				hEventLog,
+				EVENTLOG_ERROR_TYPE,
+				1,
+				0,
+				NULL,
+				3,
+				0,
+				outMsg,
+				NULL
+			);
+
+			DeregisterEventSource(hEventLog);
+
+		}
+
+	}
+ #endif // _WIN32
+
 	Local::Session::Session() : Abstract::Session() {
 
 		std::lock_guard<std::mutex> lock(sync);
 
+#ifdef _WIN32
+		{
+			static bool initialized = false;
+
+			if(!initialized) {
+
+				// Get application DATADIR
+
+				// https://github.com/curl/curl/blob/master/lib/system_win32.c
+
+				char datadir[4096];
+				HKEY hKey = 0;
+				unsigned long datalen = sizeof(datadir);
+
+				memset(datadir,0,sizeof(datadir));
+
+				LSTATUS rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE,"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\pw3270",0,KEY_QUERY_VALUE,&hKey);
+				if(rc == ERROR_SUCCESS) {
+
+					unsigned long datatype; // #defined in winnt.h (predefined types 0-11)
+
+					if(RegQueryValueExA(hKey,"InstallLocation",NULL,&datatype,(LPBYTE) datadir,&datalen) != ERROR_SUCCESS) {
+
+						// Can't get DATADIR
+
+						*datadir = 0;
+					}
+
+					RegCloseKey(hKey);
+
+				} else {
+
+					write_log("Can't open HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\pw3270", (int) rc);
+
+				}
+
+				if(*datadir) {
+
+					HMODULE kernel =
+						LoadLibrary("kernel32.dll");
+
+					if(kernel) {
+
+						HANDLE WINAPI (*AddDllDirectory)(PCWSTR) =
+							(HANDLE WINAPI (*)(PCWSTR)) GetProcAddress(kernel,"AddDllDirectory");
+
+						//BOOL WINAPI (*RemoveDllDirectory)(HANDLE) =
+						//	(BOOL WINAPI (*)(HANDLE)) GetProcAddress(kernel,"RemoveDllDirectory");
+
+						if(AddDllDirectory) {
+
+							wchar_t	*path = (wchar_t *) malloc(sizeof(datadir)*sizeof(wchar_t));
+							mbstowcs(path, datadir, 4095);
+
+							if(!AddDllDirectory(path)) {
+                                write_log("AddDllDirectory has failed");
+							}
+
+							free(path);
+
+						} else {
+
+							write_log("Can't find AddDllDirectory@kernel32.dll");
+
+						}
+
+						FreeLibrary(kernel);
+
+
+					} else {
+
+						write_log("Can't load kernel32.dll");
+
+					}
+
+				}
+
+				initialized = true;
+
+			}
+
+		}
+#endif // _WIN32
+
 		this->hSession = lib3270_session_new("");
 		lib3270_set_user_data(this->hSession,(void *) this);
 		setCharSet(lib3270_get_display_charset(this->hSession));
--
libgit2 0.21.2