diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h
index 8ec933a..4d297d1 100644
--- a/src/mesa/glapi/glthread.h
+++ b/src/mesa/glapi/glthread.h
@@ -141,7 +141,7 @@ typedef pthread_cond_t _glthread_Cond;
 
 typedef unsigned int _glthread_Cond;
 #define _glthread_DECLARE_STATIC_COND(name) \
-//  #warning Condition variables not implemented.
+/*  #warning Condition variables not implemented. */
 
 #define _glthread_INIT_COND(cond)	    \
   ASSERT(0);
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 522295a..fd0c390 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -241,7 +241,7 @@ extern "C" {
                                     ((x & 0x00ff0000) >>  8) | \
                                     ((x & 0xff000000) >> 24);
 #else /*__linux__ */
-#include <sys/endian.h>
+/* #include <sys/endian.h> */
 #define CPU_TO_LE32( x )	bswap32( x )
 #endif /*__linux__*/
 #define MESA_BIG_ENDIAN 1
diff --git a/src/mesa/main/dlopen.c b/src/mesa/main/dlopen.c
index 414cfad..7571470 100644
--- a/src/mesa/main/dlopen.c
+++ b/src/mesa/main/dlopen.c
@@ -27,12 +27,11 @@
  * Note that the #ifdef tests for various environments should be expanded.
  */
 
-
+#undef _GNU_SOURCE
 #include "compiler.h"
 #include "dlopen.h"
-
-#if defined(_GNU_SOURCE) && !defined(__MINGW32__)
-#include <dlfcn.h>
+#if defined(_GNU_SOURCE) && !defined(__MINGW32__) && !defined(__blrts)
+/*#include <dlfcn.h> */
 #endif
 #if defined(_WIN32)
 #include <windows.h>
@@ -46,7 +45,7 @@
 void *
 _mesa_dlopen(const char *libname, int flags)
 {
-#if defined(_GNU_SOURCE)
+#if defined(_GNU_SOURCE) && !defined(__blrts)
    flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
    return dlopen(libname, flags);
 #elif defined(__MINGW32__)
@@ -72,7 +71,7 @@ _mesa_dlsym(void *handle, const char *fname)
    _mesa_strncpy(fname2 + 1, fname, 998);
    fname2[999] = 0;
    return (GenericFunc) dlsym(handle, fname2);
-#elif defined(_GNU_SOURCE)
+#elif defined(_GNU_SOURCE)&& !defined(__blrts)
    return (GenericFunc) dlsym(handle, fname);
 #elif defined(__MINGW32__)
    return (GenericFunc) GetProcAddress(handle, fname);
@@ -88,7 +87,7 @@ _mesa_dlsym(void *handle, const char *fname)
 void
 _mesa_dlclose(void *handle)
 {
-#if defined(_GNU_SOURCE)
+#if defined(_GNU_SOURCE)&& !defined(__blrts)
    dlclose(handle);
 #elif defined(__MINGW32__)
    FreeLibrary(handle);
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 344dfdc..5b07fa5 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -925,7 +925,7 @@ gen_return_with_expression(slang_assemble_ctx *A, slang_operation *oper)
       slang_operation_copy(rhs, &oper->children[0]);
    }
 
-   ///blockOper->locals->outer_scope = oper->locals->outer_scope;
+   /*///blockOper->locals->outer_scope = oper->locals->outer_scope;*/
 
    /*slang_print_tree(blockOper, 0);*/
 
diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c
index ca15ce1..5350011 100644
--- a/src/mesa/state_tracker/st_atom.c
+++ b/src/mesa/state_tracker/st_atom.c
@@ -137,7 +137,7 @@ void st_validate_state( struct st_context *st )
    if (state->st == 0)
       return;
 
-//   _mesa_printf("%s %x/%x\n", __FUNCTION__, state->mesa, state->st);
+/*//   _mesa_printf("%s %x/%x\n", __FUNCTION__, state->mesa, state->st);*/
 
    if (1) {
       /* Debug version which enforces various sanity checks on the
@@ -152,7 +152,7 @@ void st_validate_state( struct st_context *st )
 	 const struct st_tracked_state *atom = atoms[i];
 	 struct st_state_flags generated;
 	 
-//	 _mesa_printf("atom %s %x/%x\n", atom->name, atom->dirty.mesa, atom->dirty.st);
+/*//	 _mesa_printf("atom %s %x/%x\n", atom->name, atom->dirty.mesa, atom->dirty.st); */
 
 	 if (!(atom->dirty.mesa || atom->dirty.st) ||
 	     !atom->update) {
@@ -162,7 +162,7 @@ void st_validate_state( struct st_context *st )
 
 	 if (check_state(state, &atom->dirty)) {
 	    atoms[i]->update( st );
-//	    _mesa_printf("after: %x\n", atom->dirty.mesa);
+/*//	    _mesa_printf("after: %x\n", atom->dirty.mesa);*/
 	 }
 
 	 accumulate_state(&examined, &atom->dirty);
@@ -175,7 +175,7 @@ void st_validate_state( struct st_context *st )
 	 assert(!check_state(&examined, &generated));
 	 prev = *state;
       }
-//      _mesa_printf("\n");
+/*//      _mesa_printf("\n"); */
 
    }
    else {
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index 902fb38..43f9117 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -515,7 +515,7 @@ reset_cache(struct st_context *st)
    struct pipe_screen *screen = pipe->screen;
    struct bitmap_cache *cache = st->bitmap.cache;
 
-   //memset(cache->buffer, 0xff, sizeof(cache->buffer));
+   /* //memset(cache->buffer, 0xff, sizeof(cache->buffer)); */
    cache->empty = GL_TRUE;
 
    cache->xmin = 1000000;
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 39c2957..18388e0 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -149,7 +149,7 @@ check_array_data(GLcontext *ctx, struct gl_client_array *array,
                                array->Ptr, array->BufferObj->Name);
                   f[k] = 1.0; /* XXX replace the bad value! */
                }
-               //assert(!IS_INF_OR_NAN(f[k]));
+               /* //assert(!IS_INF_OR_NAN(f[k])); */
             }
          }
          break;