diff --git a/build/commands.py b/build/commands.py
index 4063ba4c..4a8e4443 100644
--- a/build/commands.py
+++ b/build/commands.py
@@ -190,7 +190,7 @@ class InternalCommands:
 
 			print 'Building with GNU Make...'
 			self.try_chdir(self.bin_dir)
-			err = os.system(make_cmd)
+			err = os.system(self.make_cmd)
 			self.restore_chdir()
 
 			if err == 0:
@@ -234,7 +234,7 @@ class InternalCommands:
 
 			print 'Cleaning with GNU Make...'
 			self.try_chdir(self.bin_dir)
-			err = os.system(make_cmd + ' clean')
+			err = os.system(self.make_cmd + ' clean')
 			self.restore_chdir()
 
 			if err == 0:
diff --git a/lib/synergy/CApp.cpp b/lib/synergy/CApp.cpp
index e3cdb9a1..709e9bd1 100644
--- a/lib/synergy/CApp.cpp
+++ b/lib/synergy/CApp.cpp
@@ -19,7 +19,9 @@
 #include "CArch.h"
 #include "XBase.h"
 #include "XArch.h"
+#if SYSAPI_WIN32
 #include "CArchMiscWindows.h"
+#endif
 #include "LogOutputters.h"
 #include "XSynergy.h"