diff --git a/src/osgPlugins/fbx/ReaderWriterFBX.cpp b/src/osgPlugins/fbx/ReaderWriterFBX.cpp
index 4dcfc88e2..165c14d47 100644
--- a/src/osgPlugins/fbx/ReaderWriterFBX.cpp
+++ b/src/osgPlugins/fbx/ReaderWriterFBX.cpp
@@ -179,14 +179,14 @@ void resolveBindMatrices(
                     }
                     else
                     {
-                        osg::notify(osg::WARN) << "No vertex influences found for \"" << osgBone.getName() << "\"" << std::endl;
+                        OSG_WARN << "No vertex influences found for \"" << osgBone.getName() << "\"" << std::endl;
                     }
                 }
             }
         }
         else
         {
-            osg::notify(osg::WARN) << "No bone found for \"" << fbxBone->GetName() << "\"" << std::endl;
+            OSG_WARN << "No bone found for \"" << fbxBone->GetName() << "\"" << std::endl;
             ++it;
         }
     }
@@ -374,7 +374,7 @@ ReaderWriterFBX::readNode(const std::string& filenameInit,
     }
     catch (...)
     {
-        osg::notify(osg::WARN) << "Exception thrown while importing \"" << filenameInit << '\"' << std::endl;
+        OSG_WARN << "Exception thrown while importing \"" << filenameInit << '\"' << std::endl;
     }
 
     return ReadResult::ERROR_IN_READING_FILE;
@@ -444,7 +444,7 @@ osgDB::ReaderWriter::WriteResult ReaderWriterFBX::writeNode(
 
         // Ensure the directory exists or else the FBX SDK will fail
         if (!osgDB::makeDirectoryForFile(filename)) {
-            osg::notify(osg::NOTICE) << "Can't create directory for file '" << filename << "'. FBX SDK may fail creating the file." << std::endl;
+            OSG_NOTICE << "Can't create directory for file '" << filename << "'. FBX SDK may fail creating the file." << std::endl;
         }
 
         // The FBX SDK interprets the filename as UTF-8
diff --git a/src/osgPlugins/fbx/WriterCompareTriangle.cpp b/src/osgPlugins/fbx/WriterCompareTriangle.cpp
index bb202df4b..dc0f5488c 100644
--- a/src/osgPlugins/fbx/WriterCompareTriangle.cpp
+++ b/src/osgPlugins/fbx/WriterCompareTriangle.cpp
@@ -69,7 +69,7 @@ WriterCompareTriangle::cutscene(int                     nbVertices,
 
     setMaxMin (nbVerticesX, nbVerticesY, nbVerticesZ);
 
-    osg::notify(osg::DEBUG_INFO) << "Cutting x by " << nbVerticesX << std::endl
+    OSG_DEBUG << "Cutting x by " << nbVerticesX << std::endl
         << "Cutting y by " << nbVerticesY << std::endl
         << "Cutting z by " << nbVerticesZ << std::endl;
 
diff --git a/src/osgPlugins/fbx/WriterNodeVisitor.cpp b/src/osgPlugins/fbx/WriterNodeVisitor.cpp
index 891320542..6b178279e 100644
--- a/src/osgPlugins/fbx/WriterNodeVisitor.cpp
+++ b/src/osgPlugins/fbx/WriterNodeVisitor.cpp
@@ -271,7 +271,7 @@ void PrimitiveIndexWriter::drawArrays(GLenum mode,GLint first,GLsizei count)
     case GL_LINE_STRIP:
     case GL_LINE_LOOP:
     default:
-        osg::notify(osg::WARN) << "WriterNodeVisitor :: can't handle mode " << mode << std::endl;
+        OSG_WARN << "WriterNodeVisitor :: can't handle mode " << mode << std::endl;
         break;
     }
     if (_normalBinding == osg::Geometry::BIND_PER_PRIMITIVE_SET) ++_curNormalIndex;
@@ -366,12 +366,12 @@ WriterNodeVisitor::Material::Material(WriterNodeVisitor& writerNodeVisitor,
             osg::CullFace::Mode mode = static_cast<const osg::CullFace*>(attribute)->getMode();
             if (mode == osg::CullFace::FRONT)
             {
-                osg::notify(osg::WARN) << "FBX Writer: Reversed face (culled FRONT) not supported yet." << std::endl;
+                OSG_WARN << "FBX Writer: Reversed face (culled FRONT) not supported yet." << std::endl;
             }
             else if (mode != osg::CullFace::BACK)
             {
                 assert(mode == osg::CullFace::FRONT_AND_BACK);
-                osg::notify(osg::WARN) << "FBX Writer: Invisible face (culled FRONT_AND_BACK) not supported yet." << std::endl;
+                OSG_WARN << "FBX Writer: Invisible face (culled FRONT_AND_BACK) not supported yet." << std::endl;
             }
         }
 
@@ -438,7 +438,7 @@ WriterNodeVisitor::Material::Material(WriterNodeVisitor& writerNodeVisitor,
                 {
                     if (!osgDB::makeDirectoryForFile(destPath))
                     {
-                        osg::notify(osg::NOTICE) << "Can't create directory for file '" << destPath << "'. May fail creating the image file." << std::endl;
+                        OSG_NOTICE << "Can't create directory for file '" << destPath << "'. May fail creating the image file." << std::endl;
                     }
                     osgDB::writeImageFile(*_osgImage, destPath);
                 }
@@ -457,7 +457,7 @@ WriterNodeVisitor::Material::Material(WriterNodeVisitor& writerNodeVisitor,
 
 int WriterNodeVisitor::processStateSet(const osg::StateSet* ss)
 {
-    //osg::notify(osg::ALWAYS) << "Trying Adding " << ss->getAttribute(osg::StateAttribute::MATERIAL)->getName() << std::endl;
+    //OSG_ALWAYS << "Trying Adding " << ss->getAttribute(osg::StateAttribute::MATERIAL)->getName() << std::endl;
     MaterialMap::iterator itr = _materialMap.find(MaterialMap::key_type(ss));
     if (itr != _materialMap.end())
     {
@@ -710,7 +710,7 @@ void WriterNodeVisitor::createListTriangle(const osg::Geometry* geo,
                 if (nb == nbVertices) texcoords = true;
                 else
                 {
-                    OSG_NOTIFY(osg::WARN) << "There are more/less texture coords than vertices! Ignoring texture coords.";
+                    OSG_WARN << "There are more/less texture coords than vertices! Ignoring texture coords.";
                 }
             }
         }
diff --git a/src/osgPlugins/fbx/fbxRCamera.cpp b/src/osgPlugins/fbx/fbxRCamera.cpp
index 9607352a8..87de1200d 100644
--- a/src/osgPlugins/fbx/fbxRCamera.cpp
+++ b/src/osgPlugins/fbx/fbxRCamera.cpp
@@ -44,7 +44,7 @@ osgDB::ReaderWriter::ReadResult readFbxCamera(KFbxNode* pNode)
         case KFbxCamera::eHORIZONTAL_AND_VERTICAL:
         case KFbxCamera::eFOCAL_LENGTH:
         default:
-            osg::notify(osg::WARN) << "readFbxCamera: Unsupported Camera aperture mode." << std::endl;
+            OSG_WARN << "readFbxCamera: Unsupported Camera aperture mode." << std::endl;
             break;
         }
     }
diff --git a/src/osgPlugins/fbx/fbxRNode.cpp b/src/osgPlugins/fbx/fbxRNode.cpp
index 9e3fd986b..f80f496a2 100644
--- a/src/osgPlugins/fbx/fbxRNode.cpp
+++ b/src/osgPlugins/fbx/fbxRNode.cpp
@@ -78,7 +78,7 @@ osg::Quat makeQuat(const fbxDouble3& degrees, ERotationOrder fbxRotOrder)
             return quat;
         }
     default:
-        osg::notify(osg::WARN) << "Invalid FBX rotation mode." << std::endl;
+        OSG_WARN << "Invalid FBX rotation mode." << std::endl;
         return osg::Quat();
     }
 }