diff --git a/Makefile b/Makefile
index abbbe9c..fa53710 100644
--- a/Makefile
+++ b/Makefile
@@ -65,11 +65,11 @@ install:
 	@test -d $(INSTALL_BIN) || mkdir -p $(INSTALL_BIN)
 	@install -m 0755 $(ODIR)/$(NAME) $(INSTALL_BIN)/
 	@test -d $(INSTALL_INC) || mkdir -p $(INSTALL_INC)
-	@cp -r ./src/*.h $(INSTALL_INC)/
 	@cp -r ./src/crypt/*.h $(INSTALL_INC)/
 	@cp -r ./src/data/*.h $(INSTALL_INC)/
 	@cp -r ./src/net/*.h $(INSTALL_INC)/
 	@cp -r ./src/sys/*.h $(INSTALL_INC)/
+	@cp -r ./src/*.h $(INSTALL_INC)/
 
 .PHONY: clean
 clean:
diff --git a/src/sys/sync.h b/src/sys/sync.h
index 8704cf0..2b661ce 100644
--- a/src/sys/sync.h
+++ b/src/sys/sync.h
@@ -44,12 +44,12 @@ typedef struct XSyncBar {
 
 #ifdef _WIN32
 #define XSYNC_ATOMIC_ADD(dst,val) InterlockedExchangeAdd(dst, val)
-#define XSYNC_ATOMIC_SUB(dst,val) InterlockedExchangeSubtract(dst, dst)
+#define XSYNC_ATOMIC_SUB(dst,val) InterlockedExchangeSubtract(dst, val)
 #define XSYNC_ATOMIC_SET(dst,val) InterlockedExchange(dst, val)
 #define XSYNC_ATOMIC_GET(dst) InterlockedExchangeAdd(dst, 0)
 #else
 #define XSYNC_ATOMIC_ADD(dst,val) __sync_add_and_fetch(dst, val)
-#define XSYNC_ATOMIC_SUB(dst,val) __sync_sub_and_fetch(dst, dst)
+#define XSYNC_ATOMIC_SUB(dst,val) __sync_sub_and_fetch(dst, val)
 #define XSYNC_ATOMIC_SET(dst,val) __sync_lock_test_and_set(dst, val)
 #define XSYNC_ATOMIC_GET(dst) __sync_add_and_fetch(dst, 0)
 #endif
diff --git a/src/xver.h b/src/xver.h
index 96e71d1..cbd439e 100644
--- a/src/xver.h
+++ b/src/xver.h
@@ -12,7 +12,7 @@
 
 #define XUTILS_VERSION_MAX     2
 #define XUTILS_VERSION_MIN     5
-#define XUTILS_BUILD_NUMBER    31
+#define XUTILS_BUILD_NUMBER    32
 
 #ifdef __cplusplus
 extern "C" {