diff --git a/3d-viewer/3d_navlib/nl_3d_viewer_plugin_impl.cpp b/3d-viewer/3d_navlib/nl_3d_viewer_plugin_impl.cpp
index 1a36764f49..c43b78229d 100644
--- a/3d-viewer/3d_navlib/nl_3d_viewer_plugin_impl.cpp
+++ b/3d-viewer/3d_navlib/nl_3d_viewer_plugin_impl.cpp
@@ -195,8 +195,7 @@ void NL_3D_VIEWER_PLUGIN_IMPL::exportCommandsAndImages()
     std::vector<TDx::CImage> vImages;
 
     // add the action set to the category_store
-    CATEGORY_STORE::iterator iter = categoryStore.insert(
-            categoryStore.end(), CATEGORY_STORE::value_type( ".", &commandSet ) );
+    categoryStore.insert( categoryStore.end(), CATEGORY_STORE::value_type( ".", &commandSet ) );
 
     std::list<TOOL_ACTION*>::const_iterator it;
 
@@ -240,14 +239,14 @@ void NL_3D_VIEWER_PLUGIN_IMPL::exportCommandsAndImages()
             if( imageStream.GetSize() )
             {
                 wxStreamBuffer* streamBuffer = imageStream.GetOutputStreamBuffer();
-                TDx::CImage     image = TDx::CImage::FromData( "", 0, name.c_str() );
-                image.AssignImage( std::string( reinterpret_cast<const char*>(
-                                                        streamBuffer->GetBufferStart() ),
-                                                streamBuffer->GetBufferSize() ),
-                                   0 );
+                TDx::CImage     tdxImage = TDx::CImage::FromData( "", 0, name.c_str() );
+                tdxImage.AssignImage( std::string( reinterpret_cast<const char*>(
+                                                           streamBuffer->GetBufferStart() ),
+                                                   streamBuffer->GetBufferSize() ),
+                                      0 );
 
                 wxLogTrace( m_logTrace, "Adding image for : %s", name );
-                vImages.push_back( std::move( image ) );
+                vImages.push_back( std::move( tdxImage ) );
             }
         }
 
diff --git a/pcbnew/navlib/nl_pcbnew_plugin_impl.cpp b/pcbnew/navlib/nl_pcbnew_plugin_impl.cpp
index a59407d19c..b29d327d57 100644
--- a/pcbnew/navlib/nl_pcbnew_plugin_impl.cpp
+++ b/pcbnew/navlib/nl_pcbnew_plugin_impl.cpp
@@ -202,8 +202,7 @@ void NL_PCBNEW_PLUGIN_IMPL::exportCommandsAndImages()
     std::vector<TDx::CImage> vImages;
 
     // add the action set to the category_store
-    CATEGORY_STORE::iterator iter = categoryStore.insert(
-            categoryStore.end(), CATEGORY_STORE::value_type( ".", &commandSet ) );
+    categoryStore.insert( categoryStore.end(), CATEGORY_STORE::value_type( ".", &commandSet ) );
 
     std::list<TOOL_ACTION*>::const_iterator it;
 
@@ -248,14 +247,14 @@ void NL_PCBNEW_PLUGIN_IMPL::exportCommandsAndImages()
             if( imageStream.GetSize() )
             {
                 wxStreamBuffer* streamBuffer = imageStream.GetOutputStreamBuffer();
-                TDx::CImage     image = TDx::CImage::FromData( "", 0, name.c_str() );
-                image.AssignImage( std::string( reinterpret_cast<const char*>(
-                                                        streamBuffer->GetBufferStart() ),
-                                                streamBuffer->GetBufferSize() ),
-                                   0 );
+                TDx::CImage     tdxImage = TDx::CImage::FromData( "", 0, name.c_str() );
+                tdxImage.AssignImage( std::string( reinterpret_cast<const char*>(
+                                                           streamBuffer->GetBufferStart() ),
+                                                   streamBuffer->GetBufferSize() ),
+                                      0 );
 
                 wxLogTrace( m_logTrace, "Adding image for : %s", name );
-                vImages.push_back( std::move( image ) );
+                vImages.push_back( std::move( tdxImage ) );
             }
         }