diff --git a/src/include/pw3270/hllapi.h b/src/include/pw3270/hllapi.h
index 7c45893..a842418 100644
--- a/src/include/pw3270/hllapi.h
+++ b/src/include/pw3270/hllapi.h
@@ -114,8 +114,31 @@ extern "C" {
  #else
 
 	#define HLLAPI_API_CALL		__attribute__((visibility("default"))) extern
-	#define WORD				uint32_t
-	#define LPWORD				uint32_t *
+
+	// From wtypesbase.h
+	typedef byte BYTE;
+	typedef unsigned short WORD;
+	typedef unsigned int UINT;
+	typedef int INT;
+	typedef LONG WINBOOL;
+	typedef LONG LONG;
+	typedef ULONG DWORD;
+	typedef void *HANDLE;
+	typedef WORD *LPWORD;
+	typedef DWORD *LPDWORD;
+	typedef char CHAR;
+	typedef CHAR *LPSTR;
+	typedef const CHAR *LPCSTR;
+	typedef wchar_t WCHAR;
+	typedef WCHAR TCHAR;
+	typedef WCHAR *LPWSTR;
+	typedef TCHAR *LPTSTR;
+	typedef const WCHAR *LPCWSTR;
+	typedef const TCHAR *LPCTSTR;
+	typedef HANDLE *LPHANDLE;
+
+	#define LPWORD				uint16_t *
+
 	#define LPSTR				char *
 	#define HANDLE				int
 
diff --git a/src/plugins/hllapi/Makefile.in b/src/plugins/hllapi/Makefile.in
index 42c4794..d1b4ef3 100644
--- a/src/plugins/hllapi/Makefile.in
+++ b/src/plugins/hllapi/Makefile.in
@@ -42,12 +42,16 @@ include $(CLASSLIBDIR)/class.mak
 
 #---[ Release Targets ]--------------------------------------------------------
 
-$(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME)
+$(BINRLS)/$(PLUGIN_NAME): \
+	$(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME)
+
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
 	@$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
 
-$(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS)
+$(BINRLS)$(DLL_NAME).$(VERSION): \
+	$(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS)
+
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
 	@$(CXX) $(SYSDLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(CLASS_LIBS)
@@ -56,19 +60,30 @@ install:
 
 #---[ Debug Targets ]----------------------------------------------------------
 
-$(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME)
+$(BINDBG)/$(PLUGIN_NAME): \
+	$(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME)
+
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
 	@$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ @DBGRPATH@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
 
-$(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) $(CLASS_DEBUG_OBJECTS)
+$(BINDBG)$(DLL_NAME).$(VERSION): \
+	$(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) $(CLASS_DEBUG_OBJECTS)
+
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
 	@$(CXX) $(SYSDLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @DBGRPATH@ -L../../../.bin/Debug -o $@ $^ $(CLASS_LIBS)
 
-test: $(BINDBG)/test@EXEEXT@
+test: \
+	$(BINDBG)/test@EXEEXT@
+
+cleanDebug: \
+	clean
+
+$(BINDBG)/test@EXEEXT@: \
+	$(BINDBG)$(DLL_NAME).$(VERSION) $(OBJDBG)/testprogram.o
 
-$(BINDBG)/test@EXEEXT@: $(BINDBG)$(DLL_NAME).$(VERSION) $(OBJDBG)/testprogram.o
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
 	@$(LD) -o $@ $^ $(LIBS) $(BINDBG)$(DLL_NAME).$(VERSION)
+
--
libgit2 0.21.2