diff --git a/plugins/3d/vrml/v1/vrml1_base.cpp b/plugins/3d/vrml/v1/vrml1_base.cpp
index d5e31c039e..6ede11ef63 100644
--- a/plugins/3d/vrml/v1/vrml1_base.cpp
+++ b/plugins/3d/vrml/v1/vrml1_base.cpp
@@ -105,7 +105,7 @@ bool WRL1BASE::SetName( const std::string& aName )
 
 bool WRL1BASE::Read( WRLPROC& proc )
 {
-    if( proc.GetVRMLType() != VRML_V1 )
+    if( proc.GetVRMLType() != WRLVERSION::VRML_V1 )
     {
         #ifdef DEBUG_VRML1
         do {
diff --git a/plugins/3d/vrml/v2/vrml2_base.cpp b/plugins/3d/vrml/v2/vrml2_base.cpp
index 0ab55a0191..548242db74 100644
--- a/plugins/3d/vrml/v2/vrml2_base.cpp
+++ b/plugins/3d/vrml/v2/vrml2_base.cpp
@@ -192,7 +192,7 @@ bool WRL2BASE::SetName( const std::string& aName )
 
 bool WRL2BASE::Read( WRLPROC& proc )
 {
-    if( proc.GetVRMLType() != VRML_V2 )
+    if( proc.GetVRMLType() != WRLVERSION::VRML_V2 )
     {
         #ifdef DEBUG_VRML2
         do {
diff --git a/plugins/3d/vrml/vrml.cpp b/plugins/3d/vrml/vrml.cpp
index 1ac84fba3a..36a8ce026b 100644
--- a/plugins/3d/vrml/vrml.cpp
+++ b/plugins/3d/vrml/vrml.cpp
@@ -228,7 +228,7 @@ SCENEGRAPH* LoadVRML( const wxString& aFileName, bool useInline )
     if( tmpfilename.IsOk() )
         wxRemoveFile( tmpfilename.GetFullPath() );
 
-    if( proc.GetVRMLType() == VRML_V1 )
+    if( proc.GetVRMLType() == WRLVERSION::VRML_V1 )
     {
         wxLogTrace( MASK_VRML, " * [INFO] Processing VRML 1.0 file\n" );
 
diff --git a/plugins/3d/vrml/wrlproc.cpp b/plugins/3d/vrml/wrlproc.cpp
index e12a19fce3..ee192ef489 100644
--- a/plugins/3d/vrml/wrlproc.cpp
+++ b/plugins/3d/vrml/wrlproc.cpp
@@ -48,7 +48,7 @@
 
 WRLPROC::WRLPROC( LINE_READER* aLineReader )
 {
-    m_fileVersion = VRML_INVALID;
+    m_fileVersion = WRLVERSION::VRML_INVALID;
     m_eof = false;
     m_fileline = 0;
     m_bufpos = 0;
@@ -78,7 +78,7 @@ WRLPROC::WRLPROC( LINE_READER* aLineReader )
 
     if( m_buf.compare( 0, 16, "#VRML V1.0 ascii"  ) == 0 )
     {
-        m_fileVersion = VRML_V1;
+        m_fileVersion = WRLVERSION::VRML_V1;
         // nothing < 0x20, and no:
         // single or double quote
         // backslash
@@ -91,7 +91,7 @@ WRLPROC::WRLPROC( LINE_READER* aLineReader )
 
     if( m_buf.compare( 0, 15, "#VRML V2.0 utf8" ) == 0 )
     {
-        m_fileVersion = VRML_V2;
+        m_fileVersion = WRLVERSION::VRML_V2;
         // nothing < 0x20, and no:
         // single or double quotes
         // sharp (#)
@@ -112,7 +112,7 @@ WRLPROC::WRLPROC( LINE_READER* aLineReader )
     }
 
     m_buf.clear();
-    m_fileVersion = VRML_INVALID;
+    m_fileVersion = WRLVERSION::VRML_INVALID;
     m_eof = true;
 
     m_error = "not a valid VRML file: '";
@@ -158,7 +158,7 @@ bool WRLPROC::getRawLine( void )
     while( !m_buf.empty() && ( *m_buf.rbegin() == '\r' || *m_buf.rbegin() == '\n' ) )
         m_buf.erase( --m_buf.end() );
 
-    if( VRML_V1 == m_fileVersion && !m_buf.empty() )
+    if( WRLVERSION::VRML_V1 == m_fileVersion && !m_buf.empty() )
     {
         std::string::iterator sS = m_buf.begin();
         std::string::iterator eS = m_buf.end();
@@ -633,7 +633,7 @@ bool WRLPROC::ReadString( std::string& aSFString )
             break;
     }
 
-    if( VRML_V2 == m_fileVersion && '"' != m_buf[m_bufpos] )
+    if( WRLVERSION::VRML_V2 == m_fileVersion && '"' != m_buf[m_bufpos] )
     {
         m_error = "invalid VRML2 file (string not quoted)";
         return false;
diff --git a/plugins/3d/vrml/wrltypes.h b/plugins/3d/vrml/wrltypes.h
index 6ccfb8a276..fc9e1865d6 100644
--- a/plugins/3d/vrml/wrltypes.h
+++ b/plugins/3d/vrml/wrltypes.h
@@ -37,7 +37,7 @@
 #define MASK_VRML "PLUGIN_VRML"
 
 // version of the VRML file being parsed
-enum WRLVERSION
+enum class WRLVERSION
 {
     VRML_INVALID = 0,   // not a valid VRML file
     VRML_V1,