diff --git a/src/cc-compat.h b/src/cc-compat.h
index 29cc2ec6a..bbccd1f55 100644
--- a/src/cc-compat.h
+++ b/src/cc-compat.h
@@ -33,21 +33,8 @@
 #	define GIT_TYPEOF(x)
 #endif
 
-#ifdef __cplusplus
-#	define GIT_UNUSED(x)
-#else
-#	ifdef __GNUC__
-#		define GIT_UNUSED(x) x __attribute__ ((__unused__))
-#	else
-#		define GIT_UNUSED(x) x
-#	endif
-#endif
-
-#if defined(_MSC_VER)
-#define GIT_UNUSED_ARG(x) ((void)(x)); /* note trailing ; */
-#else
-#define GIT_UNUSED_ARG(x)
-#endif
+#define GIT_UNUSED(x) x
+#define GIT_UNUSED_ARG(x) ((void)(x))
 
 /* Define the printf format specifer to use for size_t output */
 #if defined(_MSC_VER) || defined(__MINGW32__)
diff --git a/src/win32/posix.h b/src/win32/posix.h
index 8f603657b..f4c1c121e 100644
--- a/src/win32/posix.h
+++ b/src/win32/posix.h
@@ -13,8 +13,8 @@
 
 GIT_INLINE(int) p_link(const char *GIT_UNUSED(old), const char *GIT_UNUSED(new))
 {
-	GIT_UNUSED_ARG(old)
-	GIT_UNUSED_ARG(new)
+	GIT_UNUSED_ARG(old);
+	GIT_UNUSED_ARG(new);
 	errno = ENOSYS;
 	return -1;
 }
@@ -24,7 +24,7 @@ GIT_INLINE(int) p_mkdir(const char *path, mode_t GIT_UNUSED(mode))
 	wchar_t* buf = gitwin_to_utf16(path);
 	int ret = _wmkdir(buf);
 
-	GIT_UNUSED_ARG(mode)
+	GIT_UNUSED_ARG(mode);
 
 	git__free(buf);
 	return ret;
diff --git a/tests-clar/core/dirent.c b/tests-clar/core/dirent.c
index edd04471e..782370969 100644
--- a/tests-clar/core/dirent.c
+++ b/tests-clar/core/dirent.c
@@ -90,8 +90,8 @@ static int one_entry(void *state, git_buf *path)
 
 static int dont_call_me(void *GIT_UNUSED(state), git_buf *GIT_UNUSED(path))
 {
-	GIT_UNUSED_ARG(state)
-	GIT_UNUSED_ARG(path)
+	GIT_UNUSED_ARG(state);
+	GIT_UNUSED_ARG(path);
 	return GIT_ERROR;
 }
 
diff --git a/tests/t00-core.c b/tests/t00-core.c
index 58f048af6..aff48b071 100644
--- a/tests/t00-core.c
+++ b/tests/t00-core.c
@@ -426,8 +426,8 @@ static walk_data empty = {
 
 static int dont_call_me(void *GIT_UNUSED(state), git_buf *GIT_UNUSED(path))
 {
-	GIT_UNUSED_ARG(state)
-	GIT_UNUSED_ARG(path)
+	GIT_UNUSED_ARG(state);
+	GIT_UNUSED_ARG(path);
 	return GIT_ERROR;
 }