Merged the changes from branch/merge-with-vnc-4.1.1, revisions 564:565.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@567 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/rfbplayer/rfbplayer.cxx b/rfbplayer/rfbplayer.cxx
index 0a92802..b304aec 100644
--- a/rfbplayer/rfbplayer.cxx
+++ b/rfbplayer/rfbplayer.cxx
@@ -17,18 +17,24 @@
  */
 
 // -=- RFB Player for Win32
-
 #include <windows.h>
+#include <commdlg.h>
+#include <shellapi.h>
+
+#include <rfb/LogWriter.h>
 
 #include <rfb_win32/AboutDialog.h>
+#include <rfb_win32/DeviceContext.h>
+#include <rfb_win32/MsgBox.h>
 #include <rfb_win32/WMShatter.h>
+#include <rfb_win32/Win32Util.h>
 
 #include <rfbplayer/rfbplayer.h>
 #include <rfbplayer/ChoosePixelFormatDialog.h>
 #include <rfbplayer/GotoPosDialog.h>
 #include <rfbplayer/InfoDialog.h>
 #include <rfbplayer/SessionInfoDialog.h>
-  
+
 using namespace rfb;
 using namespace rfb::win32;