diff --git a/src/Fl_Browser.cxx b/src/Fl_Browser.cxx
index 5eef0af54..59bf61912 100644
--- a/src/Fl_Browser.cxx
+++ b/src/Fl_Browser.cxx
@@ -374,7 +374,9 @@ void Fl_Browser::item_draw(void* v, int X, int Y, int W, int H) const {
     Fl_Color lcol = textcolor();
     Fl_Align talign = FL_ALIGN_LEFT;
     // check for all the @-lines recognized by XForms:
+    //#if defined(__GNUC__)
     //#warning FIXME This maybe needs to be more UTF8 aware now...?
+    //#endif /*__GNUC__*/
     while (*str == format_char() && *++str && *str != format_char()) {
       switch (*str++) {
       case 'l': case 'L': tsize = 24; break;
diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx
index 9b33e5ffe..312d5cbc5 100644
--- a/src/Fl_Help_View.cxx
+++ b/src/Fl_Help_View.cxx
@@ -1455,7 +1455,9 @@ void Fl_Help_View::format() {
 
           popfont(font, fsize, fcolor);
 
+	  //#if defined(__GNUC__)
           //#warning FIXME this isspace & 255 test will probably not work on a utf8 stream... And we use it everywhere!
+	  //#endif /*__GNUC__*/
           while (isspace((*ptr)&255))
 	    ptr ++;
 
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 4413c7ed5..f8df4d257 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -340,7 +340,11 @@ void fl_new_ic()
   XIMStyles* xim_styles = NULL;
 
 #if USE_XFT
+
+#if defined(__GNUC__)
 #warning XFT support here
+#endif /*__GNUC__*/
+
   if (!fs) {
     fnt = NULL;//fl_get_font_xfld(0, 14);
     if (!fnt) {fnt = "-misc-fixed-*";must_free_fnt=false;}
@@ -451,7 +455,11 @@ void fl_set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win)
       XFreeFontSet(fl_display, fs);
     }
 #if USE_XFT
+
+#if defined(__GNUC__)
 #warning XFT support here
+#endif /*__GNUC__*/
+
     fnt = NULL; // fl_get_font_xfld(font, size);
     if (!fnt) {fnt = "-misc-fixed-*";must_free_fnt=false;}
     fs = XCreateFontSet(fl_display, fnt, &missing_list,
diff --git a/src/fl_font_x.cxx b/src/fl_font_x.cxx
index f57bac765..a5248163a 100644
--- a/src/fl_font_x.cxx
+++ b/src/fl_font_x.cxx
@@ -299,9 +299,9 @@ double fl_width(unsigned int c) {
 
 void fl_text_extents(const char *c, int n, int &dx, int &dy, int &W, int &H) {
 
-#if !defined(WIN32) && !defined(sgi) || defined(CYGWIN)
+#if defined(__GNUC__)
 #warning fl_text_extents is only a test stub in Xlib build at present
-#endif
+#endif /*__GNUC__*/
 
   W = 0; H = 0;
   fl_measure(c, W, H, 0);
diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx
index 8632d50e5..027e1b3b2 100644
--- a/src/fl_font_xft.cxx
+++ b/src/fl_font_xft.cxx
@@ -554,7 +554,11 @@ static void fl_drawUCS4(const FcChar32 *str, int n, int x, int y) {
 
 
 void fl_rtl_draw(const char* c, int n, int x, int y) {
+
+#if defined(__GNUC__)
 #warning Need to improve this XFT right to left draw function
+#endif /*__GNUC__*/
+
 // This actually draws LtoR, but aligned to R edge with the glyph order reversed...
 // but you can't just byte-rev a UTF-8 string, that isn't valid.
 // You can reverse a UCS4 string though...
diff --git a/src/glut_font.cxx b/src/glut_font.cxx
index a1c3c3a36..474689f33 100644
--- a/src/glut_font.cxx
+++ b/src/glut_font.cxx
@@ -114,9 +114,10 @@ void glutStrokeString(void* fontID, const unsigned char *string) {
   * A newline will simply translate the next character's insertion
   * point back to the start of the line and down one line.
   */
-#if !defined(WIN32) && !defined(sgi) || defined(CYGWIN)
+
+#if defined(__GNUC__)
 #warning FIXME This needs to be UTF aware now
-#endif
+#endif /*__GNUC__*/
 
   while ((c = *string++) != 0) {
     if (c < font->Quantity) {
diff --git a/src/scandir_win32.c b/src/scandir_win32.c
index 246edc1ab..ccdd550ed 100644
--- a/src/scandir_win32.c
+++ b/src/scandir_win32.c
@@ -49,7 +49,9 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
   if (!findIn) return -1;
   strcpy(findIn, dirname);
 
+  //#if defined(__GNUC__)
   //#warning FIXME This probably needs to be MORE UTF8 aware now
+  //#endif /*__GNUC__*/
   for (d = findIn; *d; d++) if (*d=='/') *d='\\';
   if ((len==0)) { strcpy(findIn, ".\\*"); }
   if ((len==2)&&findIn[1]==':'&&isalpha(findIn[0])) { *d++ = '\\'; *d = 0; }