diff -up ncurses-6.0-20160116/include/curses.h.in.compheader ncurses-6.0-20160116/include/curses.h.in
--- ncurses-6.0-20160116/include/curses.h.in.compheader	2016-01-26 10:28:56.531558497 +0100
+++ ncurses-6.0-20160116/include/curses.h.in	2015-12-20 00:08:31.000000000 +0100
@@ -1152,7 +1152,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NA
 #define wattron(win,at)		wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
 #define wattroff(win,at)	wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
 
-#if !NCURSES_OPAQUE
+#ifdef NCURSES_INTERNALS
 #if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
 #define wattrset(win,at)	((win) \
 				  ? ((win)->_color = NCURSES_CAST(int, PAIR_NUMBER(at)), \
@@ -1300,7 +1300,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NA
 #define slk_attr_off(a,v)		((v) ? ERR : slk_attroff(a))
 #define slk_attr_on(a,v)		((v) ? ERR : slk_attron(a))
 
-#if !NCURSES_OPAQUE
+#ifdef NCURSES_INTERNALS
 #if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
 #define wattr_set(win,a,p,opts)		(((win) \
 					  ? ((win)->_attrs = ((a) & ~A_COLOR), \