diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 222f2afbd7..83e2571b54 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1097,7 +1097,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/access.h
     wx/anidecod.h
     wx/animdecod.h
-    wx/appprog.h
+    wx/appprogress.h
     wx/artprov.h
     wx/bitmap.h
     wx/bookctrl.h
@@ -1955,7 +1955,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/accel.cpp
     src/msw/anybutton.cpp
     src/msw/artmsw.cpp
-    src/msw/appprog.cpp
+    src/msw/appprogress.cpp
     src/msw/bmpbuttn.cpp
     src/msw/button.cpp
     src/msw/checkbox.cpp
diff --git a/build/msw/wx_core.vcxproj b/build/msw/wx_core.vcxproj
index d464e9487d..5e0c8d3193 100644
--- a/build/msw/wx_core.vcxproj
+++ b/build/msw/wx_core.vcxproj
@@ -603,7 +603,7 @@
     <ClCompile Include="..\..\src\msw\ole\activex.cpp" />
     <ClCompile Include="..\..\src\msw\anybutton.cpp" />
     <ClCompile Include="..\..\src\msw\app.cpp" />
-    <ClCompile Include="..\..\src\msw\appprog.cpp" />
+    <ClCompile Include="..\..\src\msw\appprogress.cpp" />
     <ClCompile Include="..\..\src\msw\artmsw.cpp" />
     <ClCompile Include="..\..\src\msw\ole\automtn.cpp" />
     <ClCompile Include="..\..\src\msw\bitmap.cpp" />
@@ -1025,7 +1025,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </CustomBuild>
     <ClInclude Include="..\..\include\wx\msw\accel.h" />
-    <ClInclude Include="..\..\include\wx\msw\appprog.h" />
+    <ClInclude Include="..\..\include\wx\msw\appprogress.h" />
     <ClInclude Include="..\..\include\wx\msw\ole\access.h" />
     <ClInclude Include="..\..\include\wx\msw\ole\activex.h" />
     <ClInclude Include="..\..\include\wx\msw\anybutton.h" />
@@ -1177,7 +1177,7 @@
     <ClInclude Include="..\..\include\wx\anidecod.h" />
     <ClInclude Include="..\..\include\wx\animdecod.h" />
     <ClInclude Include="..\..\include\wx\anybutton.h" />
-    <ClInclude Include="..\..\include\wx\appprog.h" />
+    <ClInclude Include="..\..\include\wx\appprogress.h" />
     <ClInclude Include="..\..\include\wx\artprov.h" />
     <ClInclude Include="..\..\include\wx\bitmap.h" />
     <ClInclude Include="..\..\include\wx\bmpbuttn.h" />
diff --git a/build/msw/wx_core.vcxproj.filters b/build/msw/wx_core.vcxproj.filters
index 261a7a640f..454a1293ea 100644
--- a/build/msw/wx_core.vcxproj.filters
+++ b/build/msw/wx_core.vcxproj.filters
@@ -558,7 +558,7 @@
     <ClCompile Include="..\..\src\msw\app.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\msw\appprog.cpp">
+    <ClCompile Include="..\..\src\msw\appprogress.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\msw\artmsw.cpp">
@@ -1351,7 +1351,7 @@
     <ClInclude Include="..\..\include\wx\msw\app.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\msw\appprog.h">
+    <ClInclude Include="..\..\include\wx\msw\appprogress.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\bitmap.h">
@@ -1654,7 +1654,7 @@
     <ClInclude Include="..\..\include\wx\msw\window.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\appprog.h">
+    <ClInclude Include="..\..\include\wx\appprogress.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\wx\nativewin.h">
diff --git a/include/wx/appprog.h b/include/wx/appprogress.h
similarity index 86%
rename from include/wx/appprog.h
rename to include/wx/appprogress.h
index 1100d730d8..7c29e98286 100644
--- a/include/wx/appprog.h
+++ b/include/wx/appprogress.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/appprog.h
+// Name:        wx/appprogress.h
 // Purpose:     wxAppProgressIndicator interface.
 // Author:      Chaobin Zhang <zhchbin@gmail.com>
 // Created:     2014-09-05
@@ -11,11 +11,6 @@
 #define _WX_APPPROG_H_
 
 #include "wx/defs.h"
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
 
 class WXDLLIMPEXP_CORE wxAppProgressIndicatorBase
 {
@@ -32,7 +27,7 @@ private:
 };
 
 #if defined(__WXMSW__)
-    #include "wx/msw/appprog.h"
+    #include "wx/msw/appprogress.h"
 #endif
 
 #endif  // _WX_APPPROG_H_
diff --git a/include/wx/msw/appprog.h b/include/wx/msw/appprogress.h
similarity index 96%
rename from include/wx/msw/appprog.h
rename to include/wx/msw/appprogress.h
index 527ca8e1a8..c8bcc902cd 100644
--- a/include/wx/msw/appprog.h
+++ b/include/wx/msw/appprogress.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/appprog.h
+// Name:        wx/msw/appprogress.h
 // Purpose:     wxAppProgressIndicator interface.
 // Author:      Chaobin Zhang <zhchbin@gmail.com>
 // Created:     2014-09-05
diff --git a/interface/wx/appprog.h b/interface/wx/appprogress.h
similarity index 86%
rename from interface/wx/appprog.h
rename to interface/wx/appprogress.h
index eb65462e3c..cc23d00bbb 100644
--- a/interface/wx/appprog.h
+++ b/interface/wx/appprogress.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        taskbarbutton.h
+// Name:        interface/wx/appprogress.h
 // Purpose:     interface of wxAppProgressIndicator
 // Author:      wxWidgets team
 // Licence:     wxWindows licence
@@ -27,11 +27,17 @@ public:
         @param parent
             The parent window of wxAppProgressIndicator. Note that the
             window should has taskbar button showing. If parent is NULL,
-            the progress will reflect on the taskbar buttons of all the 
+            the progress will reflect on the taskbar buttons of all the
             top level windows.
         @param maxValue
+            Integer range (maximum value) of the progress indicator.
     */
     wxAppProgressIndicator(wxWindow* parent = NULL, int maxValue = 100);
+
+    /**
+        Destructor, stops displaying progress and returns the indicator to its
+        normal state.
+    */
     virtual ~wxAppProgressIndicator();
 
     /**
diff --git a/src/msw/appprog.cpp b/src/msw/appprogress.cpp
similarity index 98%
rename from src/msw/appprog.cpp
rename to src/msw/appprogress.cpp
index fe5cf1a4b7..dd68ec9694 100644
--- a/src/msw/appprog.cpp
+++ b/src/msw/appprogress.cpp
@@ -17,7 +17,7 @@
     #include "wx/toplevel.h"
 #endif
 
-#include "wx/appprog.h"
+#include "wx/appprogress.h"
 #include "wx/msw/taskbarbutton.h"
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/gauge.cpp b/src/msw/gauge.cpp
index 4ad5074221..bc2d106326 100644
--- a/src/msw/gauge.cpp
+++ b/src/msw/gauge.cpp
@@ -33,7 +33,7 @@
     #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
 #endif
 
-#include "wx/appprog.h"
+#include "wx/appprogress.h"
 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------