diff --git a/Makefile.in b/Makefile.in
index 760b6f0..65e5955 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,6 +44,7 @@ LIBRARY_NAME=hllapi
 
 LIBRARY_SOURCES= \
 	$(wildcard src/$(LIBRARY_NAME)/*.c) \
+	$(wildcard src/$(LIBRARY_NAME)/*.cc) \
 	$(wildcard src/$(LIBRARY_NAME)/@OSNAME@/*.c) \
 	$(wildcard src/$(LIBRARY_NAME)/@OSNAME@/*.rc)
 
@@ -146,6 +147,19 @@ $(OBJDBG)/%.o: \
 		-o $@ -c $<
 
 $(OBJDBG)/%.o: \
+	%.cc \
+	$(DEPENDS)
+
+	@echo $< ...
+	@$(MKDIR) $(@D)
+
+	@$(CXX) \
+		$(CFLAGS) \
+		-Wall -Wextra -fstack-check \
+		-DDEBUG=1 \
+		-o $@ -c $<
+
+$(OBJDBG)/%.o: \
 	%.rc
 
 	@echo $< ...
@@ -166,6 +180,17 @@ $(OBJRLS)/%.o: \
 		-o $@ -c $<
 
 $(OBJRLS)/%.o: \
+	%.cc \
+	$(DEPENDS)
+
+	@echo $< ...
+	@$(MKDIR) $(@D)
+	@$(CXX) \
+		$(CFLAGS) \
+		-DNDEBUG=1 \
+		-o $@ -c $<
+
+$(OBJRLS)/%.o: \
 	%.rc
 
 	@echo $< ...
diff --git a/configure.ac b/configure.ac
index 85e1a15..2034ca4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,7 @@ case "$host" in
 		app_win32_revision=$(date +%y.%m.%d.%H)
 		AC_SUBST(WIN32_VERSION,$app_win32_revision)
 		AC_CONFIG_FILES(src/plugin/windows/resources.rc)
+		AC_CONFIG_FILES(src/hllapi/windows/resources.rc)
 		;;
 
  	*)
diff --git a/hllapi.cbp b/hllapi.cbp
index 9dc3b81..7ec7bbb 100644
--- a/hllapi.cbp
+++ b/hllapi.cbp
@@ -32,24 +32,46 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
-		<Unit filename="src/plugin/linux/daemon.h" />
-		<Unit filename="src/plugin/linux/globals.h" />
-		<Unit filename="src/plugin/linux/gobject.c">
+		<Unit filename="src/daemon/linux/daemon.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/plugin/linux/main.c">
+		<Unit filename="src/daemon/linux/iocallback.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/plugin/linux/misc.c">
+		<Unit filename="src/hllapi/calls.cc" />
+		<Unit filename="src/hllapi/client.h" />
+		<Unit filename="src/hllapi/hllapi.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/plugin/linux/service.h" />
-		<Unit filename="src/plugin/windows/main.c">
+		<Unit filename="src/hllapi/remotectl.h" />
+		<Unit filename="src/include/config.h" />
+		<Unit filename="src/include/dbus-glue.h" />
+		<Unit filename="src/ipc3270c/linux/daemon.h" />
+		<Unit filename="src/ipc3270c/linux/globals.h" />
+		<Unit filename="src/ipc3270c/linux/gobject.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/ipc3270c/linux/main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/ipc3270c/linux/misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="src/ipc3270c/linux/service.h" />
+		<Unit filename="src/ipc3270c/windows/main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/ipc3270c/windows/private.h" />
+		<Unit filename="src/ipc3270c/windows/resources.rc" />
+		<Unit filename="src/plugin/linux/daemon.h" />
+		<Unit filename="src/plugin/linux/globals.h" />
+		<Unit filename="src/plugin/linux/service.h" />
 		<Unit filename="src/plugin/windows/private.h" />
 		<Unit filename="src/plugin/windows/resources.rc" />
-		<Unit filename="src/testprogram/testprogram.c">
+		<Unit filename="src/testprograms/hllapi.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/testprograms/ipc3270c.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Extensions>
diff --git a/src/hllapi/calls.cc b/src/hllapi/calls.cc
index f06337d..e0a8759 100644
--- a/src/hllapi/calls.cc
+++ b/src/hllapi/calls.cc
@@ -31,8 +31,8 @@
  #include <cstdlib>
  #include <cstring>
 
- #include <pw3270cpp.h>
  #include <pw3270/hllapi.h>
+ #include <pw3270cpp.h>
  #include "client.h"
 
  using namespace std;
diff --git a/src/hllapi/windows/resources.rc.in b/src/hllapi/windows/resources.rc.in
new file mode 100644
index 0000000..4e5cc47
--- /dev/null
+++ b/src/hllapi/windows/resources.rc.in
@@ -0,0 +1,29 @@
+#include <windows.h>
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0
+PRODUCTVERSION  @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0
+
+BEGIN
+
+	BLOCK "StringFileInfo"
+	BEGIN
+        	BLOCK "080904E4"
+		BEGIN
+			VALUE "FileDescription",	"pw3270 HLLAPI Client Module\0"
+			VALUE "CompanyName",		"Banco do Brasil S/A.\0"
+			VALUE "FileVersion",		"@WIN32_VERSION@\0"
+            		VALUE "LegalCopyright",		"(C) 2017 Banco do Brasil S/A. All Rights Reserved\0"
+			VALUE "OriginalFilename",	"ipc3270@DLLEXT@\0"
+			VALUE "ProductName",		"@PACKAGE_NAME@\0"
+			VALUE "ProductVersion",		"@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0\0"
+		END
+	END
+
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x809, 0x04E4
+	END
+
+END
+
--
libgit2 0.21.2