diff --git a/terminal.h b/terminal.h
index 24c5ac0b..b130f886 100644
--- a/terminal.h
+++ b/terminal.h
@@ -330,6 +330,9 @@ struct terminal_tag {
     int mouse_paste_clipboard;
 };
 
-#define in_utf(term) ((term)->utf || (term)->ucsdata->line_codepage==CP_UTF8)
+static inline bool in_utf(Terminal *term)
+{
+    return term->utf || term->ucsdata->line_codepage == CP_UTF8;
+}
 
 #endif
diff --git a/windows/winstuff.h b/windows/winstuff.h
index 3334674b..f0daa6ab 100644
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -41,7 +41,11 @@
 struct Filename {
     char *path;
 };
-#define f_open(filename, mode, isprivate) ( fopen((filename)->path, (mode)) )
+static inline FILE *f_open(const Filename *filename, const char *mode,
+                           bool isprivate)
+{
+    return fopen(filename->path, mode);
+}
 
 struct FontSpec {
     char *name;