diff --git a/include/QF/qtypes.h b/include/QF/qtypes.h
index 6986fc867..14eaada42 100644
--- a/include/QF/qtypes.h
+++ b/include/QF/qtypes.h
@@ -42,6 +42,9 @@
 # undef msg_t
 #endif
 
+#undef countof
+#define countof(x) (sizeof(x)/sizeof(x[0]))
+
 #undef field_offset
 #define field_offset(type,field) ((size_t)&(((type *)0)->field))
 
diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index 05cccabc5..e30b005c0 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -693,8 +693,6 @@ static expr_type_t bool_ops[] = {
 	{}
 };
 
-#define countof(x) (sizeof(x)/sizeof(x[0]))
-
 static expr_type_t *expr_types[] = {
 	[QC_EQ] = equality_ops,
 	[QC_NE] = equality_ops,