diff --git a/builtin_set_color.cpp b/builtin_set_color.cpp
index 76efde82b..36ad70805 100644
--- a/builtin_set_color.cpp
+++ b/builtin_set_color.cpp
@@ -14,10 +14,7 @@ Functions used for implementing the set_color builtin.
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H
diff --git a/common.cpp b/common.cpp
index db0f76e08..fcb58bc0b 100644
--- a/common.cpp
+++ b/common.cpp
@@ -50,10 +50,7 @@ parts of fish.
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H
diff --git a/env.cpp b/env.cpp
index 1e63a335b..1b1b0d98c 100644
--- a/env.cpp
+++ b/env.cpp
@@ -24,10 +24,7 @@
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H
diff --git a/fallback.cpp b/fallback.cpp
index 1a87a0927..43b954354 100644
--- a/fallback.cpp
+++ b/fallback.cpp
@@ -35,10 +35,7 @@
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H
diff --git a/input.cpp b/input.cpp
index b4e323e95..9e1560cff 100644
--- a/input.cpp
+++ b/input.cpp
@@ -27,10 +27,7 @@
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H
diff --git a/io.cpp b/io.cpp
index 56cb63b6d..7f9d5d445 100644
--- a/io.cpp
+++ b/io.cpp
@@ -27,10 +27,7 @@ Utilities for io redirection.
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H
diff --git a/output.cpp b/output.cpp
index 7be8954d3..5a0d221b3 100644
--- a/output.cpp
+++ b/output.cpp
@@ -25,10 +25,7 @@
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H
diff --git a/proc.cpp b/proc.cpp
index a1a393f3d..1c887c62c 100644
--- a/proc.cpp
+++ b/proc.cpp
@@ -36,10 +36,7 @@ Some of the code in this file is based on code from the Glibc manual.
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H
diff --git a/reader.cpp b/reader.cpp
index 07ee5154e..ba50cd98c 100644
--- a/reader.cpp
+++ b/reader.cpp
@@ -48,10 +48,7 @@ commence.
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H
diff --git a/screen.cpp b/screen.cpp
index d4bf02ae4..8eb514afc 100644
--- a/screen.cpp
+++ b/screen.cpp
@@ -23,10 +23,7 @@ efficient way for transforming that to the desired screen content.
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H