diff --git a/utils/idftools/CMakeLists.txt b/utils/idftools/CMakeLists.txt
index d934baf6e8..997534ec31 100644
--- a/utils/idftools/CMakeLists.txt
+++ b/utils/idftools/CMakeLists.txt
@@ -18,14 +18,7 @@ add_executable( idf2vrml idf2vrml.cpp )
 
 target_link_libraries( dxf2idf lib_dxf idf3 ${wxWidgets_LIBRARIES} )
 
-if( WIN32 )
-    set ( LIB_GLU glu32 )
-else()
-    set ( LIB_GLU GLU )
-endif()
-
-target_link_libraries( idf2vrml idf3 ${LIB_GLU} ${wxWidgets_LIBRARIES} )
-
+target_link_libraries( idf2vrml idf3 ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES} )
 
 install( TARGETS idfcyl idfrect dxf2idf idf2vrml
     DESTINATION ${KICAD_BIN}
diff --git a/utils/idftools/vrml_layer.cpp b/utils/idftools/vrml_layer.cpp
index 3e736a41bc..cebeb2fa97 100644
--- a/utils/idftools/vrml_layer.cpp
+++ b/utils/idftools/vrml_layer.cpp
@@ -40,8 +40,6 @@
 #include <cmath>
 #include <vrml_layer.h>
 
-#include <wx/glcanvas.h>    // CALLBACK definition, needed on Windows
-
 #ifndef CALLBACK
 #define CALLBACK
 #endif
diff --git a/utils/idftools/vrml_layer.h b/utils/idftools/vrml_layer.h
index 20a315665a..5f7f456a59 100644
--- a/utils/idftools/vrml_layer.h
+++ b/utils/idftools/vrml_layer.h
@@ -32,8 +32,12 @@
  *  PCB for VRML output.
  */
 
-#ifndef VRML_BOARD_H
-#define VRML_BOARD_H
+#ifndef VRML_LAYER_H
+#define VRML_LAYER_H
+
+
+#include <wx/glcanvas.h>    // CALLBACK definition, needed on Windows
+                            // alse needed on OSX to define __DARWIN__
 
 #ifdef __WXMAC__
 #  ifdef __DARWIN__
@@ -426,4 +430,4 @@ public:
     const std::string& GetError( void );
 };
 
-#endif    // VRML_BOARD_H
+#endif    // VRML_LAYER_H