diff --git a/src/osgPlugins/OpenFlight/Document.cpp b/src/osgPlugins/OpenFlight/Document.cpp
index dc02d9095..9dbf6562d 100644
--- a/src/osgPlugins/OpenFlight/Document.cpp
+++ b/src/osgPlugins/OpenFlight/Document.cpp
@@ -83,7 +83,7 @@ void Document::pushExtension()
 {
     if (!_currentPrimaryRecord.valid())
     {
-        osg::notify(osg::WARN) << "No current primary in Document::pushExtension()." << std::endl;
+        OSG_WARN << "No current primary in Document::pushExtension()." << std::endl;
         return;
     }
 
@@ -95,7 +95,7 @@ void Document::popExtension()
     _currentPrimaryRecord=_extensionStack.back().get();
     if (!_currentPrimaryRecord.valid())
     {
-        osg::notify(osg::WARN) << "Can't decide primary in Document::popExtension()." << std::endl;
+        OSG_WARN << "Can't decide primary in Document::popExtension()." << std::endl;
         return;
     }
 
@@ -118,7 +118,7 @@ void Document::setSubSurfacePolygonOffset(int level, osg::PolygonOffset* po)
 
 osg::PolygonOffset* Document::getSubSurfacePolygonOffset(int level)
 {
-    osg::notify(osg::DEBUG_INFO)<<"Document::getSubSurfacePolygonOffset("<<level<<")"<<std::endl;
+    OSG_DEBUG<<"Document::getSubSurfacePolygonOffset("<<level<<")"<<std::endl;
     osg::ref_ptr<osg::PolygonOffset>& po = _subsurfacePolygonOffsets[level];
     if (!po)
     {
diff --git a/src/osgPlugins/OpenFlight/ExportOptions.cpp b/src/osgPlugins/OpenFlight/ExportOptions.cpp
index 80c278c5c..6adeb75e2 100644
--- a/src/osgPlugins/OpenFlight/ExportOptions.cpp
+++ b/src/osgPlugins/OpenFlight/ExportOptions.cpp
@@ -153,20 +153,20 @@ ExportOptions::parseOptionsString()
         // See if it's a Boolen/toggle
         if ( token == _validateOption )
         {
-            osg::notify( osg::INFO ) << "fltexp: Found: " << token << std::endl;
+            OSG_INFO << "fltexp: Found: " << token << std::endl;
             setValidateOnly( true );
             continue;
         }
         if ( token == _stripTextureFilePathOption )
         {
-            osg::notify( osg::INFO ) << "fltexp: Found: " << token << std::endl;
+            OSG_INFO << "fltexp: Found: " << token << std::endl;
             setStripTextureFilePath( true );
             continue;
         }
         // Protect against unrecognized options without values
         if ( pos == str.npos )
         {
-            osg::notify( osg::WARN ) << "fltexp: Bogus OptionString: " << token << std::endl;
+            OSG_WARN << "fltexp: Bogus OptionString: " << token << std::endl;
             continue;
         }
 
@@ -187,19 +187,19 @@ ExportOptions::parseOptionsString()
 
         if (token == _versionOption)
         {
-            osg::notify( osg::INFO ) << "fltexp: Token: " << token << ", Value: " << value << std::endl;
+            OSG_INFO << "fltexp: Token: " << token << ", Value: " << value << std::endl;
             int version( VERSION_16_1 );
             if( value == std::string( "15.7" ) )
                 version = VERSION_15_7;
             else if( value == std::string( "15.8" ) )
                 version = VERSION_15_8;
             else if( value != std::string( "16.1" ) )
-                osg::notify( osg::WARN ) << "fltexp: Unsupported version: " << value << ". Defaulting to 16.1." << std::endl;
+                OSG_WARN << "fltexp: Unsupported version: " << value << ". Defaulting to 16.1." << std::endl;
             setFlightFileVersionNumber( version );
         }
         else if (token == _unitsOption)
         {
-            osg::notify( osg::INFO ) << "fltexp: Token: " << token << ", Value: " << value << std::endl;
+            OSG_INFO << "fltexp: Token: " << token << ", Value: " << value << std::endl;
             FlightUnits units( METERS );
             if( value == std::string( "KILOMETERS" ) )
                 units = KILOMETERS;
@@ -210,26 +210,26 @@ ExportOptions::parseOptionsString()
             else if( value == std::string( "NAUTICAL_MILES" ) )
                 units = NAUTICAL_MILES;
             else if( value != std::string( "METERS" ) )
-                osg::notify( osg::WARN ) << "fltexp: Unsupported units: " << value << ". Defaulting to METERS." << std::endl;
+                OSG_WARN << "fltexp: Unsupported units: " << value << ". Defaulting to METERS." << std::endl;
             setFlightUnits( units );
         }
         else if (token == _tempDirOption)
         {
-            osg::notify( osg::INFO ) << "fltexp: Token: " << token << ", Value: " << value << std::endl;
+            OSG_INFO << "fltexp: Token: " << token << ", Value: " << value << std::endl;
             setTempDir( value );
         }
         else if (token == _lightingOption)
         {
-            osg::notify( osg::INFO ) << "fltexp: Token: " << token << ", Value: " << value << std::endl;
+            OSG_INFO << "fltexp: Token: " << token << ", Value: " << value << std::endl;
             bool lighting( true );
             if (value == std::string( "OFF" ) )
                 lighting = false;
             else if (value != std::string( "ON" ) )
-                osg::notify( osg::WARN ) << "fltexp: Unsupported lighting value: " << value << ". Defaulting to ON." << std::endl;
+                OSG_WARN << "fltexp: Unsupported lighting value: " << value << ". Defaulting to ON." << std::endl;
             setLightingDefault( lighting );
         }
         else
-            osg::notify( osg::WARN ) << "fltexp: Bogus OptionString: " << token << std::endl;
+            OSG_WARN << "fltexp: Bogus OptionString: " << token << std::endl;
     }
 }
 
diff --git a/src/osgPlugins/OpenFlight/FltExportVisitor.cpp b/src/osgPlugins/OpenFlight/FltExportVisitor.cpp
index 47e0db85c..a2fcf1719 100644
--- a/src/osgPlugins/OpenFlight/FltExportVisitor.cpp
+++ b/src/osgPlugins/OpenFlight/FltExportVisitor.cpp
@@ -117,12 +117,12 @@ FltExportVisitor::~FltExportVisitor()
     // Delete our temp file.
     if (_recordsStr.is_open())
     {
-        osg::notify( osg::WARN ) << "fltexp: FltExportVisitor destructor has an open temp file." << std::endl;
+        OSG_WARN << "fltexp: FltExportVisitor destructor has an open temp file." << std::endl;
         // This should not happen. FltExportVisitor::complete should close
         // this file before we get to this destructor.
         return;
     }
-    osg::notify( osg::INFO ) << "fltexp: Deleting temp file " << _recordsTempName << std::endl;
+    OSG_INFO << "fltexp: Deleting temp file " << _recordsTempName << std::endl;
     FLTEXP_DELETEFILE( _recordsTempName.c_str() );
 }
 
@@ -356,7 +356,7 @@ FltExportVisitor::apply( osg::Geode& node )
         if (!geom)
         {
             std::string warning( "fltexp: Non-Geometry Drawable encountered. Ignoring." );
-            osg::notify( osg::WARN ) << warning << std::endl;
+            OSG_WARN << warning << std::endl;
             _fltOpt->getWriteResult().warn( warning );
             continue;
         }
@@ -391,7 +391,7 @@ FltExportVisitor::apply( osg::Geode& node )
                 else
                 {
                     std::string warning( "fltexp: Unknown PrimitiveSet type." );
-                    osg::notify( osg::WARN ) << warning << std::endl;
+                    OSG_WARN << warning << std::endl;
                     _fltOpt->getWriteResult().warn( warning );
                     return;
                 }
@@ -429,7 +429,7 @@ FltExportVisitor::apply( osg::Geode& node )
                 else
                 {
                     std::string warning( "fltexp: Unknown PrimitiveSet type." );
-                    osg::notify( osg::WARN ) << warning << std::endl;
+                    OSG_WARN << warning << std::endl;
                     _fltOpt->getWriteResult().warn( warning );
                     return;
                 }
@@ -461,7 +461,7 @@ FltExportVisitor::apply( osg::Node& node )
         //   would export a Group record then continue traversal. Because we are
         //   a Node, there's no way to continue traversal, so just return.)
         std::string warning( "fltexp: Unknown Node in OpenFlight export." );
-        osg::notify( osg::WARN ) << warning << std::endl;
+        OSG_WARN << warning << std::endl;
         _fltOpt->getWriteResult().warn( warning );
         return;
     }
diff --git a/src/osgPlugins/OpenFlight/GeometryRecords.cpp b/src/osgPlugins/OpenFlight/GeometryRecords.cpp
index fddfd69e1..ceb946aae 100644
--- a/src/osgPlugins/OpenFlight/GeometryRecords.cpp
+++ b/src/osgPlugins/OpenFlight/GeometryRecords.cpp
@@ -1072,7 +1072,7 @@ protected:
 
                 if (!coord.valid())
                 {
-                    osg::notify(osg::NOTICE)<<"Warning: data error detected in LocalVertexPool::readRecord coord="<<coord.x()<<" "<<coord.y()<<" "<<coord.z()<<std::endl;
+                    OSG_NOTICE<<"Warning: data error detected in LocalVertexPool::readRecord coord="<<coord.x()<<" "<<coord.y()<<" "<<coord.z()<<std::endl;
                 }
             }
 
@@ -1087,7 +1087,7 @@ protected:
 
                 if (!color.valid())
                 {
-                    osg::notify(osg::NOTICE)<<"Warning: data error detected in LocalVertexPool::readRecord color="<<color.r()<<" "<<color.g()<<" "<<color.b()<<" "<<color.a()<<std::endl;
+                    OSG_NOTICE<<"Warning: data error detected in LocalVertexPool::readRecord color="<<color.r()<<" "<<color.g()<<" "<<color.b()<<" "<<color.a()<<std::endl;
                 }
             }
 
@@ -1098,7 +1098,7 @@ protected:
 
                 if (!color.valid())
                 {
-                    osg::notify(osg::NOTICE)<<"Warning: data error detected in LocalVertexPool::readRecord color="<<color.r()<<" "<<color.g()<<" "<<color.b()<<" "<<color.a()<<std::endl;
+                    OSG_NOTICE<<"Warning: data error detected in LocalVertexPool::readRecord color="<<color.r()<<" "<<color.g()<<" "<<color.b()<<" "<<color.a()<<std::endl;
                 }
             }
 
@@ -1109,7 +1109,7 @@ protected:
 
                 if (!normal.valid())
                 {
-                    osg::notify(osg::NOTICE)<<"Warning: data error detected in LocalVertexPool::readRecord normal="<<normal.x()<<" "<<normal.y()<<" "<<normal.z()<<std::endl;
+                    OSG_NOTICE<<"Warning: data error detected in LocalVertexPool::readRecord normal="<<normal.x()<<" "<<normal.y()<<" "<<normal.z()<<std::endl;
                 }
             }
 
@@ -1122,7 +1122,7 @@ protected:
                     
                     if (!uv.valid())
                     {
-                        osg::notify(osg::NOTICE)<<"Warning: data error detected in LocalVertexPool::readRecord uv="<<uv.x()<<" "<<uv.y()<<std::endl;
+                        OSG_NOTICE<<"Warning: data error detected in LocalVertexPool::readRecord uv="<<uv.x()<<" "<<uv.y()<<std::endl;
                     }
 
                 }
diff --git a/src/osgPlugins/OpenFlight/MaterialPaletteManager.cpp b/src/osgPlugins/OpenFlight/MaterialPaletteManager.cpp
index fccdd3244..75d44d232 100644
--- a/src/osgPlugins/OpenFlight/MaterialPaletteManager.cpp
+++ b/src/osgPlugins/OpenFlight/MaterialPaletteManager.cpp
@@ -103,7 +103,7 @@ MaterialPaletteManager::write( DataOutputStream& dos ) const
 
         {
             std::string warning( "fltexp: No support for different front and back material properties." );
-            osg::notify( osg::WARN ) << warning << std::endl;
+            OSG_WARN << warning << std::endl;
            _fltOpt.getWriteResult().warn( warning );
         }
 
diff --git a/src/osgPlugins/OpenFlight/PaletteRecords.cpp b/src/osgPlugins/OpenFlight/PaletteRecords.cpp
index 799ab2370..0577df78e 100644
--- a/src/osgPlugins/OpenFlight/PaletteRecords.cpp
+++ b/src/osgPlugins/OpenFlight/PaletteRecords.cpp
@@ -466,7 +466,7 @@ protected:
         std::string pathname = osgDB::findDataFile(filename,document.getOptions());
         if (pathname.empty())
         {
-            osg::notify(osg::WARN) << "Can't find texture (" << index << ") " << filename << std::endl;
+            OSG_WARN << "Can't find texture (" << index << ") " << filename << std::endl;
             return;
         }
 
diff --git a/src/osgPlugins/OpenFlight/PrimaryRecords.cpp b/src/osgPlugins/OpenFlight/PrimaryRecords.cpp
index 135f4c512..ca56f722f 100644
--- a/src/osgPlugins/OpenFlight/PrimaryRecords.cpp
+++ b/src/osgPlugins/OpenFlight/PrimaryRecords.cpp
@@ -69,16 +69,16 @@ protected:
     virtual void readRecord(RecordInputStream& in, Document& document)
     {
         std::string id = in.readString(8);
-        osg::notify(osg::DEBUG_INFO) << "ID: " << id << std::endl;
+        OSG_DEBUG << "ID: " << id << std::endl;
 
         uint32 format = in.readUInt32();
-        osg::notify(osg::DEBUG_INFO) << "Format: " << format << std::endl;
+        OSG_DEBUG << "Format: " << format << std::endl;
         document._version = format;
 
         /*uint32 revision =*/ in.readUInt32();
 
         std::string revisionTime = in.readString(32);
-        osg::notify(osg::INFO) << "Last revision: " << revisionTime << std::endl;
+        OSG_INFO << "Last revision: " << revisionTime << std::endl;
 
         in.forward(4*2);
 
@@ -131,7 +131,7 @@ protected:
         osgSim::GeographicLocation* loc = new osgSim::GeographicLocation;
         loc->set( originLat, originLong );
         _header->setUserData( loc );
-        osg::notify(osg::INFO) << "DB lat=" << originLat << " lon=" << originLong << std::endl;
+        OSG_INFO << "DB lat=" << originLat << " lon=" << originLong << std::endl;
 
         document.setHeaderNode(_header.get());
     }
@@ -200,7 +200,7 @@ protected:
     void readRecord(RecordInputStream& in, Document& document)
     {
         std::string id = in.readString(8);
-        osg::notify(osg::DEBUG_INFO) << "ID: " << id << std::endl;
+        OSG_DEBUG << "ID: " << id << std::endl;
 
         /*int16 relativePriority =*/ in.readInt16();
         in.forward(2);
@@ -396,10 +396,10 @@ protected:
         
         if ((length_x*length_y*length_z)==0.0f)
         {
-            osg::notify(osg::NOTICE)<<"Warning: OpenFlight DegreeOfFreedom::readRecord() found erroneous axis definition:"<<std::endl;
-            osg::notify(osg::NOTICE)<<"    localOrigin="<<localOrigin<<std::endl;
-            osg::notify(osg::NOTICE)<<"    pointOnXAxis="<<pointOnXAxis<<std::endl;
-            osg::notify(osg::NOTICE)<<"    pointInXYPlane="<<pointInXYPlane<<std::endl;
+            OSG_NOTICE<<"Warning: OpenFlight DegreeOfFreedom::readRecord() found erroneous axis definition:"<<std::endl;
+            OSG_NOTICE<<"    localOrigin="<<localOrigin<<std::endl;
+            OSG_NOTICE<<"    pointOnXAxis="<<pointOnXAxis<<std::endl;
+            OSG_NOTICE<<"    pointInXYPlane="<<pointInXYPlane<<std::endl;
             
             xAxis.set(1.0f,0.0f,0.0f);
             yAxis.set(0.0f,1.0f,0.0f);
diff --git a/src/osgPlugins/OpenFlight/ReaderWriterATTR.cpp b/src/osgPlugins/OpenFlight/ReaderWriterATTR.cpp
index d2d3c5209..312b3be5d 100644
--- a/src/osgPlugins/OpenFlight/ReaderWriterATTR.cpp
+++ b/src/osgPlugins/OpenFlight/ReaderWriterATTR.cpp
@@ -195,7 +195,7 @@ ReaderWriterATTR::writeObject(const osg::Object& object, const std::string& file
     const AttrData* attr = dynamic_cast< const AttrData* >( &object );
     if (attr == NULL)
     {
-        osg::notify( osg::FATAL ) << "AttrWriter: Invalid Object." << std::endl;
+        OSG_FATAL << "AttrWriter: Invalid Object." << std::endl;
         return WriteResult::FILE_NOT_HANDLED;
     }
 
diff --git a/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp b/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp
index cb2b8c8cd..43d63132e 100644
--- a/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp
+++ b/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp
@@ -310,7 +310,7 @@ class FLTReaderWriter : public ReaderWriter
 
                 if ( !keepExternalReferences )
                 {
-                    osg::notify(osg::DEBUG_INFO) << "keepExternalReferences not found, so externals will be re-readed"<<std::endl;
+                    OSG_DEBUG << "keepExternalReferences not found, so externals will be re-readed"<<std::endl;
                     // read externals.
                     if (rr.getNode())
                     {
@@ -322,7 +322,7 @@ class FLTReaderWriter : public ReaderWriter
                 }
                 else
                 {
-                    osg::notify(osg::DEBUG_INFO) << "keepExternalReferences found, so externals will be left as ProxyNodes"<<std::endl;    
+                    OSG_DEBUG << "keepExternalReferences found, so externals will be left as ProxyNodes"<<std::endl;    
                 }
             }
 
@@ -349,31 +349,31 @@ class FLTReaderWriter : public ReaderWriter
                 const char readerMsg[] = "flt reader option: ";
                 
                 document.setReplaceClampWithClampToEdge((options->getOptionString().find("clampToEdge")!=std::string::npos));
-                osg::notify(osg::DEBUG_INFO) << readerMsg << "clampToEdge=" << document.getReplaceClampWithClampToEdge() << std::endl;
+                OSG_DEBUG << readerMsg << "clampToEdge=" << document.getReplaceClampWithClampToEdge() << std::endl;
 
                 document.setKeepExternalReferences((options->getOptionString().find("keepExternalReferences")!=std::string::npos));
-                osg::notify(osg::DEBUG_INFO) << readerMsg << "keepExternalReferences=" << document.getKeepExternalReferences() << std::endl;
+                OSG_DEBUG << readerMsg << "keepExternalReferences=" << document.getKeepExternalReferences() << std::endl;
 
                 document.setPreserveFace((options->getOptionString().find("preserveFace")!=std::string::npos));
-                osg::notify(osg::DEBUG_INFO) << readerMsg << "preserveFace=" << document.getPreserveFace() << std::endl;
+                OSG_DEBUG << readerMsg << "preserveFace=" << document.getPreserveFace() << std::endl;
 
                 document.setPreserveObject((options->getOptionString().find("preserveObject")!=std::string::npos));
-                osg::notify(osg::DEBUG_INFO) << readerMsg << "preserveObject=" << document.getPreserveObject() << std::endl;
+                OSG_DEBUG << readerMsg << "preserveObject=" << document.getPreserveObject() << std::endl;
 
                 document.setDefaultDOFAnimationState((options->getOptionString().find("dofAnimation")!=std::string::npos));
-                osg::notify(osg::DEBUG_INFO) << readerMsg << "dofAnimation=" << document.getDefaultDOFAnimationState() << std::endl;
+                OSG_DEBUG << readerMsg << "dofAnimation=" << document.getDefaultDOFAnimationState() << std::endl;
 
                 document.setUseBillboardCenter((options->getOptionString().find("billboardCenter")!=std::string::npos));
-                osg::notify(osg::DEBUG_INFO) << readerMsg << "billboardCenter=" << document.getUseBillboardCenter() << std::endl;
+                OSG_DEBUG << readerMsg << "billboardCenter=" << document.getUseBillboardCenter() << std::endl;
 
                 document.setUseTextureAlphaForTransparancyBinning(options->getOptionString().find("noTextureAlphaForTransparancyBinning")==std::string::npos);
-                osg::notify(osg::DEBUG_INFO) << readerMsg << "noTextureAlphaForTransparancyBinning=" << !document.getUseTextureAlphaForTransparancyBinning() << std::endl;
+                OSG_DEBUG << readerMsg << "noTextureAlphaForTransparancyBinning=" << !document.getUseTextureAlphaForTransparancyBinning() << std::endl;
 
                 document.setReadObjectRecordData(options->getOptionString().find("readObjectRecordData")==std::string::npos);
-                osg::notify(osg::DEBUG_INFO) << readerMsg << "readObjectRecordData=" << !document.getReadObjectRecordData() << std::endl;
+                OSG_DEBUG << readerMsg << "readObjectRecordData=" << !document.getReadObjectRecordData() << std::endl;
 
                 document.setDoUnitsConversion((options->getOptionString().find("noUnitsConversion")==std::string::npos)); // default to true, unless noUnitsConversion is specified.
-                osg::notify(osg::DEBUG_INFO) << readerMsg << "noUnitsConversion=" << !document.getDoUnitsConversion() << std::endl;
+                OSG_DEBUG << readerMsg << "noUnitsConversion=" << !document.getDoUnitsConversion() << std::endl;
 
                 if (document.getDoUnitsConversion())
                 {
@@ -549,7 +549,7 @@ class FLTReaderWriter : public ReaderWriter
             fOut.open( fileName.c_str(), std::ios::out | std::ios::binary );
             if ( fOut.fail())
             {
-                osg::notify( osg::FATAL ) << "fltexp: Failed to open output stream." << std::endl;
+                OSG_FATAL << "fltexp: Failed to open output stream." << std::endl;
                 return WriteResult::ERROR_IN_WRITING_FILE;
             }
 
@@ -583,7 +583,7 @@ class FLTReaderWriter : public ReaderWriter
                 // If the temp directory doesn't already exist, make it.
                 if ( !osgDB::makeDirectory( fltOpt->getTempDir() ) )
                 {
-                    osg::notify( osg::FATAL ) << "fltexp: Error creating temp dir: " << fltOpt->getTempDir() << std::endl;
+                    OSG_FATAL << "fltexp: Error creating temp dir: " << fltOpt->getTempDir() << std::endl;
                     return WriteResult::ERROR_IN_WRITING_FILE;
                 }
             }
diff --git a/src/osgPlugins/OpenFlight/RecordInputStream.cpp b/src/osgPlugins/OpenFlight/RecordInputStream.cpp
index 743dc7596..a5d904f17 100644
--- a/src/osgPlugins/OpenFlight/RecordInputStream.cpp
+++ b/src/osgPlugins/OpenFlight/RecordInputStream.cpp
@@ -47,7 +47,7 @@ bool RecordInputStream::readRecordBody(opcode_type opcode, size_type size, Docum
     const uint16 LITTLE_ENDIAN_POP_LEVEL_OP = 0x0B00;
     if (opcode==LITTLE_ENDIAN_POP_LEVEL_OP)
     {
-        osg::notify(osg::INFO) << "Little endian pop-level record" << std::endl;
+        OSG_INFO << "Little endian pop-level record" << std::endl;
         opcode=POP_LEVEL_OP;
         size=4;
     }
@@ -76,7 +76,7 @@ bool RecordInputStream::readRecordBody(opcode_type opcode, size_type size, Docum
     }
     else // prototype not found
     {
-        osg::notify(osg::WARN) << "Unknown record, opcode=" << opcode << " size=" << size << std::endl;
+        OSG_WARN << "Unknown record, opcode=" << opcode << " size=" << size << std::endl;
 
         // Add to registry so we only have to see this error message once.
         Registry::instance()->addPrototype(opcode,new DummyRecord);
diff --git a/src/osgPlugins/OpenFlight/Registry.cpp b/src/osgPlugins/OpenFlight/Registry.cpp
index 3dd29f637..13bc72682 100644
--- a/src/osgPlugins/OpenFlight/Registry.cpp
+++ b/src/osgPlugins/OpenFlight/Registry.cpp
@@ -40,12 +40,12 @@ void Registry::addPrototype(int opcode, Record* prototype)
 {
     if (prototype==0L)
     {
-        osg::notify(osg::WARN) << "Not a record." << std::endl;
+        OSG_WARN << "Not a record." << std::endl;
         return;
     }
 
     if (_recordProtoMap.find(opcode) != _recordProtoMap.end())
-        osg::notify(osg::WARN) << "Registry already contains prototype for opcode " << opcode << "." << std::endl;
+        OSG_WARN << "Registry already contains prototype for opcode " << opcode << "." << std::endl;
 
     _recordProtoMap[opcode] = prototype;
 }
diff --git a/src/osgPlugins/OpenFlight/VertexPaletteManager.cpp b/src/osgPlugins/OpenFlight/VertexPaletteManager.cpp
index 80593b7bb..ae6b8b47d 100644
--- a/src/osgPlugins/OpenFlight/VertexPaletteManager.cpp
+++ b/src/osgPlugins/OpenFlight/VertexPaletteManager.cpp
@@ -42,12 +42,12 @@ VertexPaletteManager::~VertexPaletteManager()
         // Delete our temp file.
         if (_verticesStr.is_open())
         {
-            osg::notify( osg::WARN ) << "fltexp: VertexPaletteManager destructor has an open temp file." << std::endl;
+            OSG_WARN << "fltexp: VertexPaletteManager destructor has an open temp file." << std::endl;
             // This should not happen. FltExportVisitor::complete should close
             // this file before we get to this destructor.
             return;
         }
-        osg::notify( osg::INFO ) << "fltexp: Deleting temp file " << _verticesTempName << std::endl;    
+        OSG_INFO << "fltexp: Deleting temp file " << _verticesTempName << std::endl;    
         FLTEXP_DELETEFILE( _verticesTempName.c_str() );
     }
 }
@@ -58,7 +58,7 @@ VertexPaletteManager::add( const osg::Geometry& geom )
     const osg::Array* v = geom.getVertexArray();
     if (!v)
     {
-        osg::notify( osg::WARN ) << "fltexp: Attempting to add NULL vertex array in VertexPaletteManager." << std::endl;
+        OSG_WARN << "fltexp: Attempting to add NULL vertex array in VertexPaletteManager." << std::endl;
         return;
     }
     const osg::Array* c = geom.getColorArray();
@@ -129,12 +129,12 @@ VertexPaletteManager::byteOffset( unsigned int idx ) const
 {
     if (!_current)
     {
-        osg::notify( osg::WARN ) << "fltexp: No current vertex array in VertexPaletteManager." << std::endl;
+        OSG_WARN << "fltexp: No current vertex array in VertexPaletteManager." << std::endl;
         return 4;
     }
     if (idx >= _current->_idxCount)
     {
-        osg::notify( osg::WARN ) << "fltexp: Index out of range in VertexPaletteManager." << std::endl;
+        OSG_WARN << "fltexp: Index out of range in VertexPaletteManager." << std::endl;
         return 4;
     }
 
@@ -232,19 +232,19 @@ VertexPaletteManager::writeRecords( const osg::Vec3dArray* v, const osg::Vec4Arr
     case VERTEX_CN:
         opcode = VERTEX_CN_OP;
         if (!n)
-            osg::notify( osg::WARN ) << "fltexp: VPM::writeRecords: no normal array." << std::endl;
+            OSG_WARN << "fltexp: VPM::writeRecords: no normal array." << std::endl;
         break;
     case VERTEX_CNT:
         opcode = VERTEX_CNT_OP;
         if (!n)
-            osg::notify( osg::WARN ) << "fltexp: VPM::writeRecords: no normal array." << std::endl;
+            OSG_WARN << "fltexp: VPM::writeRecords: no normal array." << std::endl;
         if (!t)
-            osg::notify( osg::WARN ) << "fltexp: VPM::writeRecords: no tex coord array." << std::endl;
+            OSG_WARN << "fltexp: VPM::writeRecords: no tex coord array." << std::endl;
         break;
     case VERTEX_CT:
         opcode = VERTEX_CT_OP;
         if (!t)
-            osg::notify( osg::WARN ) << "fltexp: VPM::writeRecords: no tex coord array." << std::endl;
+            OSG_WARN << "fltexp: VPM::writeRecords: no tex coord array." << std::endl;
         break;
     }
 
@@ -368,7 +368,7 @@ VertexPaletteManager::asVec2Array( const osg::Array* in, const unsigned int n )
     }
     default:
     {
-        osg::notify( osg::WARN ) << "fltexp: Unsupported array type in conversion to Vec2Array: " << arrayType << std::endl;
+        OSG_WARN << "fltexp: Unsupported array type in conversion to Vec2Array: " << arrayType << std::endl;
         return NULL;
     }
     }
@@ -416,7 +416,7 @@ VertexPaletteManager::asVec3Array( const osg::Array* in, const unsigned int n )
     }
     default:
     {
-        osg::notify( osg::WARN ) << "fltexp: Unsupported array type in conversion to Vec3Array: " << arrayType << std::endl;
+        OSG_WARN << "fltexp: Unsupported array type in conversion to Vec3Array: " << arrayType << std::endl;
         return NULL;
     }
     }
@@ -464,7 +464,7 @@ VertexPaletteManager::asVec3dArray( const osg::Array* in, const unsigned int n )
     }
     default:
     {
-        osg::notify( osg::WARN ) << "fltexp: Unsupported array type in conversion to Vec3dArray: " << arrayType << std::endl;
+        OSG_WARN << "fltexp: Unsupported array type in conversion to Vec3dArray: " << arrayType << std::endl;
         return NULL;
     }
     }
@@ -520,7 +520,7 @@ VertexPaletteManager::asVec4Array( const osg::Array* in, const unsigned int n )
     }
     default:
     {
-        osg::notify( osg::WARN ) << "fltexp: Unsupported array type in conversion to Vec4Array: " << arrayType << std::endl;
+        OSG_WARN << "fltexp: Unsupported array type in conversion to Vec4Array: " << arrayType << std::endl;
         return NULL;
     }
     }
diff --git a/src/osgPlugins/OpenFlight/VertexRecords.cpp b/src/osgPlugins/OpenFlight/VertexRecords.cpp
index 30c5cbb8f..a6de5eeff 100644
--- a/src/osgPlugins/OpenFlight/VertexRecords.cpp
+++ b/src/osgPlugins/OpenFlight/VertexRecords.cpp
@@ -190,17 +190,17 @@ class VertexCNT : public Record
 
             if (!coord.valid())
             {
-                osg::notify(osg::NOTICE)<<"Warning: data error detected in VertexCNT::readRecord coord="<<coord.x()<<" "<<coord.y()<<" "<<coord.z()<<std::endl;
+                OSG_NOTICE<<"Warning: data error detected in VertexCNT::readRecord coord="<<coord.x()<<" "<<coord.y()<<" "<<coord.z()<<std::endl;
             }
 
             if (!normal.valid())
             {
-                osg::notify(osg::NOTICE)<<"Warning: data error detected in VertexCNT::readRecord normal="<<normal.x()<<" "<<normal.y()<<" "<<normal.z()<<std::endl;
+                OSG_NOTICE<<"Warning: data error detected in VertexCNT::readRecord normal="<<normal.x()<<" "<<normal.y()<<" "<<normal.z()<<std::endl;
             }
 
             if (!uv.valid())
             {
-                osg::notify(osg::NOTICE)<<"Warning: data error detected in VertexCNT::readRecord uv="<<uv.x()<<" "<<uv.y()<<std::endl;
+                OSG_NOTICE<<"Warning: data error detected in VertexCNT::readRecord uv="<<uv.x()<<" "<<uv.y()<<std::endl;
             }
 
             // color
diff --git a/src/osgPlugins/OpenFlight/expAncillaryRecords.cpp b/src/osgPlugins/OpenFlight/expAncillaryRecords.cpp
index c6efe7b32..6605f0347 100644
--- a/src/osgPlugins/OpenFlight/expAncillaryRecords.cpp
+++ b/src/osgPlugins/OpenFlight/expAncillaryRecords.cpp
@@ -46,7 +46,7 @@ FltExportVisitor::writeComment( const osg::Node& node, DataOutputStream* dos )
             // short overrun
             std::string warning( "fltexp: writeComment: Descriptions too long, resorts in short overrun. Skipping." );
             _fltOpt->getWriteResult().warn( warning );
-            osg::notify( osg::WARN ) << warning << std::endl;
+            OSG_WARN << warning << std::endl;
             continue;
         }
         uint16 length( (uint16)iLen );
@@ -100,7 +100,7 @@ FltExportVisitor::writeMatrix( const osg::Referenced* ref )
 void
 FltExportVisitor::writeContinuationRecord( const unsigned short length )
 {
-    osg::notify( osg::DEBUG_INFO ) << "fltexp: Continuation record length: " << length+4 << std::endl;
+    OSG_DEBUG << "fltexp: Continuation record length: " << length+4 << std::endl;
     _records->writeInt16( (int16) CONTINUATION_OP );
     _records->writeUInt16( length+4 );
 }
diff --git a/src/osgPlugins/OpenFlight/expGeometryRecords.cpp b/src/osgPlugins/OpenFlight/expGeometryRecords.cpp
index 2544a15b6..443f543c8 100644
--- a/src/osgPlugins/OpenFlight/expGeometryRecords.cpp
+++ b/src/osgPlugins/OpenFlight/expGeometryRecords.cpp
@@ -185,7 +185,7 @@ FltExportVisitor::writeFace( const osg::Geode& geode, const osg::Geometry& geom,
     case GL_POINTS:
     {
         std::string warning( "fltexp: GL_POINTS not supported in FLT export." );
-        osg::notify( osg::WARN ) << warning << std::endl;
+        OSG_WARN << warning << std::endl;
         _fltOpt->getWriteResult().warn( warning );
         return;
         break;
@@ -195,7 +195,7 @@ FltExportVisitor::writeFace( const osg::Geode& geode, const osg::Geometry& geom,
     case GL_QUAD_STRIP:
     {
         std::string warning( "fltexp: Wrong mode in Face record." );
-        osg::notify( osg::WARN ) << warning << std::endl;
+        OSG_WARN << warning << std::endl;
         _fltOpt->getWriteResult().warn( warning );
         return;
         break;
@@ -248,7 +248,7 @@ FltExportVisitor::writeFace( const osg::Geode& geode, const osg::Geometry& geom,
         else
         {
             std::string warning( "fltexp: Face is textured, but Texture2D StateAttribute is NULL." );
-            osg::notify( osg::WARN ) << warning << std::endl;
+            OSG_WARN << warning << std::endl;
             _fltOpt->getWriteResult().warn( warning );
         }
     }
@@ -423,7 +423,7 @@ FltExportVisitor::writeMesh( const osg::Geode& geode, const osg::Geometry& geom
         else
         {
             std::string warning( "fltexp: Mesh is textured, but Texture2D StateAttribute is NULL." );
-            osg::notify( osg::WARN ) << warning << std::endl;
+            OSG_WARN << warning << std::endl;
             _fltOpt->getWriteResult().warn( warning );
         }
     }
@@ -579,7 +579,7 @@ FltExportVisitor::writeLocalVertexPool( const osg::Geometry& geom )
     if (!v3)
     {
         std::string warning( "fltexp: writeLocalVertexPool: VertexArray is not Vec3Array." );
-        osg::notify( osg::WARN ) << warning << std::endl;
+        OSG_WARN << warning << std::endl;
         _fltOpt->getWriteResult().warn( warning );
         return;
     }
@@ -755,7 +755,7 @@ FltExportVisitor::writeMultitexture( const osg::Geometry& geom )
             {
                 std::ostringstream warning;
                 warning << "fltexp: No Texture2D for unit " << idx;
-                osg::notify( osg::WARN ) << warning.str() << std::endl;
+                OSG_WARN << warning.str() << std::endl;
                 _fltOpt->getWriteResult().warn( warning.str() );
             }
 
@@ -804,7 +804,7 @@ FltExportVisitor::writeUVList( int numVerts, const osg::Geometry& geom )
             {
                 std::ostringstream warning;
                 warning << "fltexp: No Texture2D for unit " << idx;
-                osg::notify( osg::WARN ) << warning.str() << std::endl;
+                OSG_WARN << warning.str() << std::endl;
                 _fltOpt->getWriteResult().warn( warning.str() );
                 t2 = new osg::Vec2Array;
             }
@@ -812,7 +812,7 @@ FltExportVisitor::writeUVList( int numVerts, const osg::Geometry& geom )
             {
                 std::ostringstream warning;
                 warning << "fltexp: Invalid number of texture coordinates for unit " << idx;
-                osg::notify( osg::WARN ) << warning.str() << std::endl;
+                OSG_WARN << warning.str() << std::endl;
                 _fltOpt->getWriteResult().warn( warning.str() );
             }
 
diff --git a/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp b/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp
index 56bd982ee..9b6dd61b6 100644
--- a/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp
+++ b/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp
@@ -283,7 +283,7 @@ FltExportVisitor::writeObject( const osg::Group& group, osgSim::ObjectRecordData
     if (!ord)
     {
         std::string warning( "fltexp: writeObject has invalid ObjectRecordData." );
-        osg::notify( osg::WARN ) << warning << std::endl;
+        OSG_WARN << warning << std::endl;
         _fltOpt->getWriteResult().warn( warning );
         return;
     }