diff --git a/.gitignore b/.gitignore
index f8cab25..b59dd8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ stamp-h1
 .bin
 .obj
 dbus-glue.h
+*.rc
diff --git a/Makefile.in b/Makefile.in
index 4350b63..a689c7b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,8 +39,8 @@ TEST_SOURCES= \
 
 #---[ Tools ]----------------------------------------------------------------------------
 
-CC=@CXX@
-LD=@CXX@
+CC=@CC@
+LD=@CC@
 LN_S=@LN_S@
 MKDIR=@MKDIR_P@
 INSTALL=@INSTALL@
@@ -189,12 +189,10 @@ all: \
 	$(POTDIR)/$(MODULE_NAME).pot
 
 Release: \
-	$(BINRLS)/$(MODULE_NAME)@DLLEXT@ \
-	$(BINRLS)/$(PACKAGE_NAME)d@EXEEXT@
+	$(BINRLS)/$(MODULE_NAME)@DLLEXT@
 
 $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \
-	$(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \
-	$(BINRLS)/lib$(MODULE_NAME).a	
+	$(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o)
 
 	@$(MKDIR) $(@D)
 	@echo $< ...
@@ -203,22 +201,12 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \
 		-o $@ \
 		$(LDFLAGS) \
 		$(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \
-		-L$(BINRLS) -l$(MODULE_NAME) \
 		$(V3270_LIBS) \
 		$(LIBS) \
 		$(GTK_LIBS) \
 		$(DBUS_LIBS)
 
 
-$(BINRLS)/lib$(MODULE_NAME).a: \
-	$(foreach SRC, $(basename $(CORE_SOURCES)), $(OBJRLS)/$(SRC).o)
-
-	@$(MKDIR) $(@D)
-	@echo $< ...
-
-	@$(AR) rcs $@ $^
-
-
 #---[ Install Targets ]------------------------------------------------------------------
 
 install: \
@@ -292,7 +280,7 @@ $(BINDBG)/$(MODULE_NAME)@DLLEXT@: \
 		-o $@ \
 		$(LDFLAGS) \
 		$(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJDBG)/$(SRC).o) \
-		-L$(BINDBG) -lpw3270cpp \
+		-L$(BINDBG) \
 		$(V3270_LIBS) \
 		$(LIBS) \
 		$(GTK_LIBS) \
diff --git a/hllapi.cbp b/hllapi.cbp
index f9c2027..9dc3b81 100644
--- a/hllapi.cbp
+++ b/hllapi.cbp
@@ -47,6 +47,8 @@
 		<Unit filename="src/plugin/windows/main.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="src/plugin/windows/private.h" />
+		<Unit filename="src/plugin/windows/resources.rc" />
 		<Unit filename="src/testprogram/testprogram.c">
 			<Option compilerVar="CC" />
 		</Unit>
--
libgit2 0.21.2