diff --git a/utils/fgpanel/ApplicationProperties.cxx b/utils/fgpanel/ApplicationProperties.cxx
index 0c26b8694..2224e0730 100644
--- a/utils/fgpanel/ApplicationProperties.cxx
+++ b/utils/fgpanel/ApplicationProperties.cxx
@@ -16,8 +16,12 @@
 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
-#include <unistd.h>
-#include <dirent.h>
+
+#ifdef _WIN32
+# include <direct.h> // for getcwd()
+#else // !_WIN32
+# include <unistd.h>
+#endif
 
 #include "ApplicationProperties.hxx"
 
diff --git a/utils/fgpanel/CMakeLists.txt b/utils/fgpanel/CMakeLists.txt
index 732471b70..484c14261 100644
--- a/utils/fgpanel/CMakeLists.txt
+++ b/utils/fgpanel/CMakeLists.txt
@@ -80,19 +80,21 @@ add_executable(fgpanel
 target_link_libraries(fgpanel
   SimGearCore
   ${PNG_LIBRARIES}
-  ${SIMGEAR_CORE_LIBRARIES}
-  ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
-  -lfreetype
+  ${FREETYPE_LIBRARIES}
   )
 
 if(${BCMHOST_INCLUDE_DIR} STREQUAL "BCMHOST_INCLUDE_DIR-NOTFOUND")
   find_package(GLUT REQUIRED)
   if(GLUT_FOUND)
-    message(STATUS "found glut")
+    message(STATUS "found GLUT inc ${GLUT_INCLUDE_DIR}, lib ${GLUT_LIBRARIES} ")
+    if (MSVC)
+        add_definitions( -DFREEGLUT_LIB_PRAGMAS=0 )
+    endif ()
 
     target_link_libraries(fgpanel
+      ${OPENGL_LIBRARIES}
       ${GLUT_LIBRARIES}
-      -lGLEW ${OPENGL_LIBRARIES}
+      ${GLEW_LIBRARIES}
       )
   else(GLUT_FOUND)
     message(STATUS "glut NOT found, can't build fgpanel")