1 files changed, 10 insertions, 8 deletions
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index 23e4bb7..f89f349 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -13,15 +13,21 @@
 #ifndef cmCPackGenerator_h
 #define cmCPackGenerator_h
 
-#include "cmObject.h"
+#include <cmConfigure.h>
 
+#include "cmCPackComponentGroup.h"
+#include "cmObject.h"
 #include "cmSystemTools.h"
+#include "cmTypeMacro.h"
+
 #include <map>
+#include <sstream>
+#include <string>
 #include <vector>
 
-#include "cmCPackComponentGroup.h" // cmCPackComponent and friends
-// Forward declarations are insufficient since we use them in
-// std::map data members below...
+class cmCPackLog;
+class cmInstalledFile;
+class cmMakefile;
 
 #define cmCPackTypeMacro(klass, superclass)                                   \
   cmTypeMacro(klass, superclass);                                             \
@@ -46,10 +52,6 @@
 #endif
 #define cout no_cout_use_cmCPack_Log
 
-class cmMakefile;
-class cmCPackLog;
-class cmInstalledFile;
-
 /** \class cmCPackGenerator
  * \brief A superclass of all CPack Generators
  *