diff --git a/3d-viewer/common_ogl/ogl_utils.cpp b/3d-viewer/common_ogl/ogl_utils.cpp
index 5e974026b6..9058ca2f3f 100644
--- a/3d-viewer/common_ogl/ogl_utils.cpp
+++ b/3d-viewer/common_ogl/ogl_utils.cpp
@@ -27,6 +27,7 @@
  * @brief implements generic openGL functions that are common to any openGL target
  */
 
+#include <GL/glew.h>
 
 #include "openGL_includes.h"
 #include "ogl_utils.h"
diff --git a/pcbnew/dialogs/panel_modedit_defaults.cpp b/pcbnew/dialogs/panel_modedit_defaults.cpp
index c446477463..1c826ccb3c 100644
--- a/pcbnew/dialogs/panel_modedit_defaults.cpp
+++ b/pcbnew/dialogs/panel_modedit_defaults.cpp
@@ -111,7 +111,7 @@ public:
 
     bool AppendRows( size_t aNumRows = 1 ) override
     {
-        for( int i = 0; i < aNumRows; ++i )
+        for( size_t i = 0; i < aNumRows; ++i )
             m_items.emplace_back( wxT( "" ), true, F_SilkS );
 
         if( GetView() )
@@ -247,7 +247,7 @@ bool PANEL_MODEDIT_DEFAULTS::TransferDataToWindow()
     // Footprint defaults
     m_textItemsGrid->GetTable()->AppendRows( m_brdSettings.m_DefaultFPTextItems.size() );
 
-    for( int i = 0; i < m_brdSettings.m_DefaultFPTextItems.size(); ++i )
+    for( size_t i = 0; i < m_brdSettings.m_DefaultFPTextItems.size(); ++i )
     {
         TEXT_ITEM_INFO item = m_brdSettings.m_DefaultFPTextItems[i];
 
@@ -289,7 +289,7 @@ bool PANEL_MODEDIT_DEFAULTS::Show( bool aShow )
 
     if( aShow && m_firstShow )
     {
-        m_layerClassesGrid->SetColumnWidth( 0, m_layerClassesGrid->GetColumnWidth( 0 ) + 1 );
+        m_layerClassesGrid->SetColSize( 0, m_layerClassesGrid->GetColSize( 0 ) + 1 );
         m_firstShow = false;
     }
 
diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp
index aa55c7dc4c..d2e6fcf0ea 100644
--- a/pcbnew/footprint_libraries_utils.cpp
+++ b/pcbnew/footprint_libraries_utils.cpp
@@ -1052,7 +1052,7 @@ MODULE* PCB_BASE_FRAME::CreateNewModule( const wxString& aModuleName )
     module->Value().SetPosition( default_pos );
     default_pos.y += settings.GetTextSize( layer ).y;
 
-    for( int i = 2; i < settings.m_DefaultFPTextItems.size(); ++i )
+    for( size_t i = 2; i < settings.m_DefaultFPTextItems.size(); ++i )
     {
         TEXTE_MODULE* textItem = new TEXTE_MODULE( module );
         textItem->SetText( settings.m_DefaultFPTextItems[i].m_Text );