diff --git a/include/osg/GraphicsContext b/include/osg/GraphicsContext
index aadf26305..1debeb011 100644
--- a/include/osg/GraphicsContext
+++ b/include/osg/GraphicsContext
@@ -256,10 +256,10 @@ class OSG_EXPORT GraphicsContext : public Object
         /** Run the operations. */
         void runOperations();
 
-        typedef std::list< ref_ptr<Operation> > OperationQueue;
+        typedef std::list< ref_ptr<Operation> > GraphicsOperationQueue;
         
         /** Get the operations queue, not you must use the OperationsMutex when accessing the queue.*/
-        OperationQueue& getOperationsQueue() { return _operations; }
+        GraphicsOperationQueue& getOperationsQueue() { return _operations; }
 
         /** Get the operations queue mutex.*/
         OpenThreads::Mutex* getOperationsMutex() { return &_operationsMutex; }
@@ -471,7 +471,7 @@ class OSG_EXPORT GraphicsContext : public Object
         
         OpenThreads::Mutex                  _operationsMutex;
         osg::ref_ptr<osg::RefBlock>         _operationsBlock;
-        OperationQueue                      _operations;
+        GraphicsOperationQueue              _operations;
         osg::ref_ptr<Operation>             _currentOperation;
 
         ref_ptr<GraphicsThread>             _graphicsThread;
diff --git a/src/osg/GraphicsContext.cpp b/src/osg/GraphicsContext.cpp
index 6ca7219e8..0fcecf3e9 100644
--- a/src/osg/GraphicsContext.cpp
+++ b/src/osg/GraphicsContext.cpp
@@ -679,7 +679,7 @@ void GraphicsContext::remove(Operation* operation)
     // acquire the lock on the operations queue to prevent anyone else for modifying it at the same time
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
 
-    for(OperationQueue::iterator itr = _operations.begin();
+    for(GraphicsOperationQueue::iterator itr = _operations.begin();
         itr!=_operations.end();)
     {
         if ((*itr)==operation) itr = _operations.erase(itr);
@@ -700,7 +700,7 @@ void GraphicsContext::remove(const std::string& name)
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
 
     // find the remove all operations with specified name
-    for(OperationQueue::iterator itr = _operations.begin();
+    for(GraphicsOperationQueue::iterator itr = _operations.begin();
         itr!=_operations.end();)
     {
         if ((*itr)->getName()==name) itr = _operations.erase(itr);
@@ -750,7 +750,7 @@ void GraphicsContext::runOperations()
         if (camera->getRenderer()) (*(camera->getRenderer()))(this);
     }
 
-    for(OperationQueue::iterator itr = _operations.begin();
+    for(GraphicsOperationQueue::iterator itr = _operations.begin();
         itr != _operations.end();
         )
     {
diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp
index 4f4fa5fdc..aed6c9e6b 100644
--- a/src/osgWrappers/osg/GraphicsContext.cpp
+++ b/src/osgWrappers/osg/GraphicsContext.cpp
@@ -33,7 +33,7 @@ TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext::ScreenSettings >, osg::Graphi
 
 TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osg::GraphicsContext::GraphicsContexts)
 
-TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Operation > >, osg::GraphicsContext::OperationQueue)
+TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Operation > >, osg::GraphicsContext::GraphicsOperationQueue)
 
 TYPE_NAME_ALIAS(std::list< osg::Camera * >, osg::GraphicsContext::Cameras)
 
@@ -113,9 +113,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext)
 	          __void__runOperations,
 	          "Run the operations. ",
 	          "");
-	I_Method0(osg::GraphicsContext::OperationQueue &, getOperationsQueue,
+	I_Method0(osg::GraphicsContext::GraphicsOperationQueue &, getOperationsQueue,
 	          Properties::NON_VIRTUAL,
-	          __OperationQueue_R1__getOperationsQueue,
+	          __GraphicsOperationQueue_R1__getOperationsQueue,
 	          "Get the operations queue, not you must use the OperationsMutex when accessing the queue. ",
 	          "");
 	I_Method0(OpenThreads::Mutex *, getOperationsMutex,
@@ -395,8 +395,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext)
 	I_SimpleProperty(OpenThreads::Mutex *, OperationsMutex, 
 	                 __OpenThreads_Mutex_P1__getOperationsMutex, 
 	                 0);
-	I_SimpleProperty(osg::GraphicsContext::OperationQueue &, OperationsQueue, 
-	                 __OperationQueue_R1__getOperationsQueue, 
+	I_SimpleProperty(osg::GraphicsContext::GraphicsOperationQueue &, OperationsQueue, 
+	                 __GraphicsOperationQueue_R1__getOperationsQueue, 
 	                 0);
 	I_SimpleProperty(osg::GraphicsContext::ResizedCallback *, ResizedCallback, 
 	                 __ResizedCallback_P1__getResizedCallback,