diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index 5223416e8f..611cb6d29a 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -52,7 +52,7 @@
 #include "platform_win32.h"
 
 #ifdef HAVE_NVDA
-#include "../../nvdaController.h"
+#include "../../nvda_controller.h"
 #endif
 
 #ifndef SM_SERVERR2
diff --git a/nvdaController.h b/nvda_controller.h
similarity index 98%
rename from nvdaController.h
rename to nvda_controller.h
index 78cb0738d0..d2ace11524 100644
--- a/nvdaController.h
+++ b/nvda_controller.h
@@ -27,7 +27,7 @@
 
 #ifndef __RPCNDR_H_VERSION__
 #error this stub requires an updated version of <rpcndr.h>
-#endif // __RPCNDR_H_VERSION__
+#endif /* __RPCNDR_H_VERSION__ */
 
 
 #ifndef __nvdaController_h__