diff --git a/c-host/app.c b/c-host/app.c
index 5b54d749..359e0a39 100644
--- a/c-host/app.c
+++ b/c-host/app.c
@@ -23,6 +23,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include <inttypes.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include "debug.h"
 #include "locking.h"
 #include "capture/interfaces.h"
diff --git a/common/locking.h b/common/locking.h
index 97ed72ba..24e3949c 100644
--- a/common/locking.h
+++ b/common/locking.h
@@ -18,7 +18,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #pragma once
 
-#if __MINGW32__
+#if defined(__GCC__) || defined(__GNUC__)
 #define INTERLOCKED_AND8 __sync_and_and_fetch
 #define INTERLOCKED_OR8 __sync_or_and_fetch
 #else