diff --git a/src/osgText/DefaultFont.cpp b/src/osgText/DefaultFont.cpp
index debc05095..ff6f9428e 100644
--- a/src/osgText/DefaultFont.cpp
+++ b/src/osgText/DefaultFont.cpp
@@ -44,7 +44,7 @@ DefaultFont* DefaultFont::instance()
 
 void DefaultFont::setSize(unsigned int, unsigned int)
 {
-    osg::notify(osg::INFO)<<"DefaultFont::setSize(,) call is ignored."<<std::endl;
+    OSG_INFO<<"DefaultFont::setSize(,) call is ignored."<<std::endl;
 }
 
 
diff --git a/src/osgText/FadeText.cpp b/src/osgText/FadeText.cpp
index 99554ba14..ea7537011 100644
--- a/src/osgText/FadeText.cpp
+++ b/src/osgText/FadeText.cpp
@@ -38,7 +38,7 @@ struct FadeTextData : public osg::Referenced
         if (nearestZ < _vertices[2].z()) nearestZ = _vertices[2].z();
         if (nearestZ < _vertices[3].z()) nearestZ = _vertices[3].z();
 
-        // osg::notify(osg::NOTICE)<<"getNearestZ()="<<_fadeText->getText().createUTF8EncodedString()<<" "<<nearestZ<<std::endl;
+        // OSG_NOTICE<<"getNearestZ()="<<_fadeText->getText().createUTF8EncodedString()<<" "<<nearestZ<<std::endl;
 
         return nearestZ;
     }
@@ -86,24 +86,24 @@ struct FadeTextPolytopeData : public FadeTextData, public osg::Polytope
         add(osg::Plane( osg::Vec3d(0.0f,0.0f,0.0f), _vertices[3], _vertices[0]));
         
 #if 0
-        osg::notify(osg::NOTICE)<<" normalFrontFace = "<<normalFrontFace<<std::endl;
-        osg::notify(osg::NOTICE)<<" edge01 = "<<edge01<<std::endl;
-        osg::notify(osg::NOTICE)<<" edge12 = "<<edge12<<std::endl;
-        osg::notify(osg::NOTICE)<<" edge23 = "<<edge23<<std::endl;
-        osg::notify(osg::NOTICE)<<" _vertices[0]= "<<_vertices[0]<<std::endl;
-        osg::notify(osg::NOTICE)<<" _vertices[1]= "<<_vertices[1]<<std::endl;
-        osg::notify(osg::NOTICE)<<" _vertices[2]= "<<_vertices[2]<<std::endl;
-        osg::notify(osg::NOTICE)<<" _vertices[3]= "<<_vertices[3]<<std::endl;
+        OSG_NOTICE<<" normalFrontFace = "<<normalFrontFace<<std::endl;
+        OSG_NOTICE<<" edge01 = "<<edge01<<std::endl;
+        OSG_NOTICE<<" edge12 = "<<edge12<<std::endl;
+        OSG_NOTICE<<" edge23 = "<<edge23<<std::endl;
+        OSG_NOTICE<<" _vertices[0]= "<<_vertices[0]<<std::endl;
+        OSG_NOTICE<<" _vertices[1]= "<<_vertices[1]<<std::endl;
+        OSG_NOTICE<<" _vertices[2]= "<<_vertices[2]<<std::endl;
+        OSG_NOTICE<<" _vertices[3]= "<<_vertices[3]<<std::endl;
 #endif
 
         if (needToFlip) flip();
 
 #if 0        
-        osg::notify(osg::NOTICE)<<"   plane 0 "<< _planeList[0]<<std::endl;
-        osg::notify(osg::NOTICE)<<"   plane 1 "<< _planeList[1]<<std::endl;
-        osg::notify(osg::NOTICE)<<"   plane 2 "<< _planeList[2]<<std::endl;
-        osg::notify(osg::NOTICE)<<"   plane 3 "<< _planeList[3]<<std::endl;
-        osg::notify(osg::NOTICE)<<"   plane 4 "<< _planeList[4]<<std::endl;
+        OSG_NOTICE<<"   plane 0 "<< _planeList[0]<<std::endl;
+        OSG_NOTICE<<"   plane 1 "<< _planeList[1]<<std::endl;
+        OSG_NOTICE<<"   plane 2 "<< _planeList[2]<<std::endl;
+        OSG_NOTICE<<"   plane 3 "<< _planeList[3]<<std::endl;
+        OSG_NOTICE<<"   plane 4 "<< _planeList[4]<<std::endl;
 #endif
         
     }
@@ -156,7 +156,7 @@ struct GlobalFadeText : public osg::Referenced
 
         if (!userData)
         {
-            osg::notify(osg::NOTICE)<<"Memory error, unable to create FadeTextUserData."<<std::endl;
+            OSG_NOTICE<<"Memory error, unable to create FadeTextUserData."<<std::endl;
             return 0;
         }
 
@@ -223,13 +223,13 @@ struct GlobalFadeText : public osg::Referenced
                 FadeTextPolytopeData& outer_ftpm = *(outer_itr->second);
                 outer_ftpm.buildPolytope();
 
-                // osg::notify(osg::NOTICE)<<"Outer z "<<outer_ftpm.getNearestZ()<<std::endl;
+                // OSG_NOTICE<<"Outer z "<<outer_ftpm.getNearestZ()<<std::endl;
 
                 while(inner_itr != fadeTextPolytopeMap.end())
                 {
                     FadeTextPolytopeData& inner_ftpm = *(inner_itr->second);
                     
-                    // osg::notify(osg::NOTICE)<<"Inner z "<<inner_ftpm.getNearestZ()<<std::endl;
+                    // OSG_NOTICE<<"Inner z "<<inner_ftpm.getNearestZ()<<std::endl;
 
                     if (outer_ftpm.contains(inner_ftpm.getReferenceVertexList()))
                     {
@@ -373,7 +373,7 @@ void FadeText::drawImplementation(osg::RenderInfo& renderInfo) const
     {
         if (renderInfo.getUserData())
         {
-            osg::notify(osg::NOTICE)<<"Warning user data not of supported type."<<std::endl;
+            OSG_NOTICE<<"Warning user data not of supported type."<<std::endl;
             return;
         }
 
@@ -381,7 +381,7 @@ void FadeText::drawImplementation(osg::RenderInfo& renderInfo) const
 
         if (!userData)
         {
-            osg::notify(osg::NOTICE)<<"Memory error, unable to create FadeTextUserData."<<std::endl;
+            OSG_NOTICE<<"Memory error, unable to create FadeTextUserData."<<std::endl;
             return;
         }
 
diff --git a/src/osgText/Font.cpp b/src/osgText/Font.cpp
index f2be1d178..8d4ca3c96 100644
--- a/src/osgText/Font.cpp
+++ b/src/osgText/Font.cpp
@@ -83,7 +83,7 @@ std::string osgText::findFontFile(const std::string& str)
     }
 
     // Not found, return empty string
-    osg::notify(osg::INFO)<<"Warning: font file \""<<str<<"\" not found."<<std::endl;    
+    OSG_INFO<<"Warning: font file \""<<str<<"\" not found."<<std::endl;    
     return std::string();
 }
 
@@ -132,7 +132,7 @@ osgText::Font* osgText::readFontStream(std::istream& stream, const osgDB::Reader
     osgDB::ReaderWriter::ReadResult rr = reader->readObject(stream, userOptions ? userOptions : localOptions.get());
     if (rr.error())
     {
-        osg::notify(osg::WARN) << rr.message() << std::endl;
+        OSG_WARN << rr.message() << std::endl;
         return 0;
     }
     if (!rr.validObject()) return 0;
@@ -191,7 +191,7 @@ osg::ref_ptr<Font> osgText::readRefFontStream(std::istream& stream, const osgDB:
     osgDB::ReaderWriter::ReadResult rr = reader->readObject(stream, userOptions ? userOptions : localOptions.get());
     if (rr.error())
     {
-        osg::notify(osg::WARN) << rr.message() << std::endl;
+        OSG_WARN << rr.message() << std::endl;
         return 0;
     }
     if (!rr.validObject()) return 0;
@@ -428,7 +428,7 @@ void Font::addGlyph(const FontResolution& fontRes, unsigned int charcode, Glyph*
         static int numberOfTexturesAllocated = 0;
         ++numberOfTexturesAllocated;
 
-        osg::notify(osg::INFO)<< "   Font " << this<< ", numberOfTexturesAllocated "<<numberOfTexturesAllocated<<std::endl;
+        OSG_INFO<< "   Font " << this<< ", numberOfTexturesAllocated "<<numberOfTexturesAllocated<<std::endl;
 
         // reserve enough space for the glyphs.
         glyphTexture->setGlyphImageMargin(_margin);
@@ -442,7 +442,7 @@ void Font::addGlyph(const FontResolution& fontRes, unsigned int charcode, Glyph*
         
         if (!glyphTexture->getSpaceForGlyph(glyph,posX,posY))
         {
-            osg::notify(osg::WARN)<<"Warning: unable to allocate texture big enough for glyph"<<std::endl;
+            OSG_WARN<<"Warning: unable to allocate texture big enough for glyph"<<std::endl;
             return;
         }
 
@@ -587,9 +587,9 @@ void Font::GlyphTexture::apply(osg::State& state) const
         glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
         if (maxTextureSize < getTextureWidth() || maxTextureSize < getTextureHeight())
         {
-            osg::notify(osg::WARN)<<"Warning: osgText::Font texture size of ("<<getTextureWidth()<<", "<<getTextureHeight()<<") too large, unable to create font texture."<<std::endl;
-            osg::notify(osg::WARN)<<"         Maximum supported by hardward by native OpenGL implementation is ("<<maxTextureSize<<","<<maxTextureSize<<")."<<std::endl;
-            osg::notify(osg::WARN)<<"         Please set OSG_MAX_TEXTURE_SIZE lenvironment variable to "<<maxTextureSize<<" and re-run application."<<std::endl;
+            OSG_WARN<<"Warning: osgText::Font texture size of ("<<getTextureWidth()<<", "<<getTextureHeight()<<") too large, unable to create font texture."<<std::endl;
+            OSG_WARN<<"         Maximum supported by hardward by native OpenGL implementation is ("<<maxTextureSize<<","<<maxTextureSize<<")."<<std::endl;
+            OSG_WARN<<"         Please set OSG_MAX_TEXTURE_SIZE lenvironment variable to "<<maxTextureSize<<" and re-run application."<<std::endl;
             return;
         }
         
@@ -630,8 +630,8 @@ void Font::GlyphTexture::apply(osg::State& state) const
         }
         
 
-//        osg::notify(osg::NOTICE)<<"Texture width = "<<getTextureWidth()<<std::endl;
-//        osg::notify(osg::NOTICE)<<"Texture height = "<<getTextureHeight()<<std::endl;
+//        OSG_NOTICE<<"Texture width = "<<getTextureWidth()<<std::endl;
+//        OSG_NOTICE<<"Texture height = "<<getTextureHeight()<<std::endl;
                
         // allocate the texture memory.
         glTexImage2D( GL_TEXTURE_2D, 0, GL_ALPHA,
@@ -663,7 +663,7 @@ void Font::GlyphTexture::apply(osg::State& state) const
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
 
         s_renderer = glGetString(GL_RENDERER);
-        osg::notify(osg::INFO)<<"glGetString(GL_RENDERER)=="<<s_renderer<<std::endl;
+        OSG_INFO<<"glGetString(GL_RENDERER)=="<<s_renderer<<std::endl;
         if (s_renderer && strstr((const char*)s_renderer,"IMPACT")!=0)
         {
             // we're running on an Octane, so need to work around its
@@ -732,7 +732,7 @@ void Font::GlyphTexture::apply(osg::State& state) const
         }
         else
         {
-            osg::notify(osg::INFO)<<"osgText::Font loading all glyphs as a single subload."<<std::endl;
+            OSG_INFO<<"osgText::Font loading all glyphs as a single subload."<<std::endl;
 
             // Octane has bugs in OGL driver which mean that subloads smaller
             // than 32x32 produce errors, and also cannot handle general alignment,
@@ -784,7 +784,7 @@ void Font::GlyphTexture::apply(osg::State& state) const
     }
     else
     {
-//        osg::notify(osg::INFO) << "no need to subload "<<std::endl;
+//        OSG_INFO << "no need to subload "<<std::endl;
     }
 
 
@@ -863,16 +863,16 @@ void Font::Glyph::subload() const
     {
 #ifdef OSG_GLU_AVAILABLE
         const GLubyte* msg = gluErrorString(errorNo);
-        if (msg) osg::notify(osg::WARN)<<"before Font::Glyph::subload(): detected OpenGL error: "<<msg<<std::endl;
-        else  osg::notify(osg::WARN)<<"before Font::Glyph::subload(): detected OpenGL error number: "<<errorNo<<std::endl;
+        if (msg) { OSG_WARN<<"before Font::Glyph::subload(): detected OpenGL error: "<<msg<<std::endl; }
+        else  { OSG_WARN<<"before Font::Glyph::subload(): detected OpenGL error number: "<<errorNo<<std::endl; }
 #else
-        osg::notify(osg::WARN)<<"before Font::Glyph::subload(): detected OpenGL error number: "<<errorNo<<std::endl;
+        OSG_WARN<<"before Font::Glyph::subload(): detected OpenGL error number: "<<errorNo<<std::endl;
 #endif
     }
 
     if(s() <= 0 || t() <= 0)
     {
-        osg::notify(osg::INFO)<<"Font::Glyph::subload(): texture sub-image width and/or height of 0, ignoring operation."<<std::endl;      
+        OSG_INFO<<"Font::Glyph::subload(): texture sub-image width and/or height of 0, ignoring operation."<<std::endl;      
         return;
     }
 
@@ -892,13 +892,13 @@ void Font::Glyph::subload() const
 
 #ifdef OSG_GLU_AVAILABLE
         const GLubyte* msg = gluErrorString(errorNo);
-        if (msg) osg::notify(osg::WARN)<<"after Font::Glyph::subload() : detected OpenGL error: "<<msg<<std::endl;
-        else osg::notify(osg::WARN)<<"after Font::Glyph::subload() : detected OpenGL error number: "<<errorNo<<std::endl;
+        if (msg) { OSG_WARN<<"after Font::Glyph::subload() : detected OpenGL error: "<<msg<<std::endl; }
+        else { OSG_WARN<<"after Font::Glyph::subload() : detected OpenGL error number: "<<errorNo<<std::endl; }
 #else
-        osg::notify(osg::WARN)<<"after Font::Glyph::subload() : detected OpenGL error number: "<<errorNo<<std::endl;
+        OSG_WARN<<"after Font::Glyph::subload() : detected OpenGL error number: "<<errorNo<<std::endl;
 #endif
 
-        osg::notify(osg::WARN)<< "\tglTexSubImage2D(0x"<<hex<<GL_TEXTURE_2D<<dec<<" ,"<<0<<"\t"<<std::endl<<
+        OSG_WARN<< "\tglTexSubImage2D(0x"<<hex<<GL_TEXTURE_2D<<dec<<" ,"<<0<<"\t"<<std::endl<<
                                  "\t                "<<_texturePosX<<" ,"<<_texturePosY<<std::endl<<
                                  "\t                "<<s()<<" ,"<<t()<<std::endl<<hex<<
                                  "\t                0x"<<(GLenum)getPixelFormat()<<std::endl<<
diff --git a/src/osgText/Font3D.cpp b/src/osgText/Font3D.cpp
index 5f766d8b7..33b2d482c 100644
--- a/src/osgText/Font3D.cpp
+++ b/src/osgText/Font3D.cpp
@@ -86,7 +86,7 @@ std::string findFont3DFile(const std::string& str)
     }
 
     // Not found, return empty string
-    osg::notify(osg::WARN)<<"Warning: font file \""<<str<<"\" not found."<<std::endl;
+    OSG_WARN<<"Warning: font file \""<<str<<"\" not found."<<std::endl;
     return std::string();
 }
 
@@ -153,7 +153,7 @@ osgText::Font3D* readFont3DStream(std::istream& stream, const osgDB::ReaderWrite
     osgDB::ReaderWriter::ReadResult rr = reader->readObject(stream, userOptions ? userOptions : localOptions.get());
     if (rr.error())
     {
-        osg::notify(osg::WARN) << rr.message() << std::endl;
+        OSG_WARN << rr.message() << std::endl;
         return 0;
     }
     if (!rr.validObject()) return 0;
@@ -227,7 +227,7 @@ osg::ref_ptr<Font3D> readRefFont3DStream(std::istream& stream, const osgDB::Read
     osgDB::ReaderWriter::ReadResult rr = reader->readObject(stream, userOptions ? userOptions : localOptions.get());
     if (rr.error())
     {
-        osg::notify(osg::WARN) << rr.message() << std::endl;
+        OSG_WARN << rr.message() << std::endl;
         return 0;
     }
     if (!rr.validObject()) return 0;
diff --git a/src/osgText/String.cpp b/src/osgText/String.cpp
index a4d1275fd..fd7331818 100644
--- a/src/osgText/String.cpp
+++ b/src/osgText/String.cpp
@@ -228,7 +228,7 @@ unsigned int getNextCharacter(look_ahead_iterator& charString,String::Encoding e
         {
             // Should not reach this point unless the encoding is unhandled
             // ENCODING_UTF16, ENCODING_UTF32 and ENCODING_SIGNATURE should never enter this method
-            osg::notify(osg::FATAL)<<"Error: Invalid string encoding"<<std::endl;    
+            OSG_FATAL<<"Error: Invalid string encoding"<<std::endl;
             break;
         }
     }
diff --git a/src/osgText/Text.cpp b/src/osgText/Text.cpp
index b184e6963..c987727ea 100644
--- a/src/osgText/Text.cpp
+++ b/src/osgText/Text.cpp
@@ -1356,7 +1356,7 @@ void Text::drawImplementation(osg::State& state, const osg::Vec4& colorMultiplie
                     glPopAttrib();
             }
         #else
-            osg::notify(osg::NOTICE)<<"Warning: Text::drawImplementation() fillMode FILLEDBOUNDINGBOX not supported"<<std::endl;
+            OSG_NOTICE<<"Warning: Text::drawImplementation() fillMode FILLEDBOUNDINGBOX not supported"<<std::endl;
         #endif
         }
     }    
@@ -1670,7 +1670,7 @@ void Text::renderWithPolygonOffset(osg::State& state, const osg::Vec4& colorMult
 
     glPopAttrib();
 #else
-    osg::notify(osg::NOTICE)<<"Warning: Text::renderWithPolygonOffset(..) not implemented."<<std::endl;
+    OSG_NOTICE<<"Warning: Text::renderWithPolygonOffset(..) not implemented."<<std::endl;
 #endif
 }
     
@@ -1724,7 +1724,7 @@ void Text::renderWithNoDepthBuffer(osg::State& state, const osg::Vec4& colorMult
 
     glPopAttrib();
 #else
-    osg::notify(osg::NOTICE)<<"Warning: Text::renderWithNoDepthBuffer(..) not implemented."<<std::endl;
+    OSG_NOTICE<<"Warning: Text::renderWithNoDepthBuffer(..) not implemented."<<std::endl;
 #endif
 }
 
@@ -1785,7 +1785,7 @@ void Text::renderWithDepthRange(osg::State& state, const osg::Vec4& colorMultipl
 
     glPopAttrib();
 #else
-    osg::notify(osg::NOTICE)<<"Warning: Text::renderWithDepthRange(..) not implemented."<<std::endl;
+    OSG_NOTICE<<"Warning: Text::renderWithDepthRange(..) not implemented."<<std::endl;
 #endif
 }
 
@@ -1946,6 +1946,6 @@ void Text::renderWithStencilBuffer(osg::State& state, const osg::Vec4& colorMult
 
     glPopAttrib();
 #else
-    osg::notify(osg::NOTICE)<<"Warning: Text::renderWithStencilBuffer(..) not implemented."<<std::endl;
+    OSG_NOTICE<<"Warning: Text::renderWithStencilBuffer(..) not implemented."<<std::endl;
 #endif
 }