diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index 80bb55d2a..2e062bcd1 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -9,19 +9,22 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include "cmCursesStandardIncludes.h"
-
-#include "../cmDocumentation.h"
-#include "../cmSystemTools.h"
-#include "../cmake.h"
-
-#include <signal.h>
-#include <sys/ioctl.h>
+#include <cmConfigure.h>
 
+#include "cmCursesForm.h"
 #include "cmCursesMainForm.h"
-#include <cmsys/Encoding.hxx>
+#include "cmCursesStandardIncludes.h"
+#include "cmDocumentation.h"
+#include "cmDocumentationEntry.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
-#include <form.h>
+#include <cmsys/Encoding.hxx>
+#include <iostream>
+#include <signal.h>
+#include <string.h>
+#include <string>
+#include <vector>
 
 static const char* cmDocumentationName[][2] = {
   { CM_NULLPTR, "  ccmake - Curses Interface for CMake." },
diff --git a/Source/CursesDialog/cmCursesBoolWidget.cxx b/Source/CursesDialog/cmCursesBoolWidget.cxx
index 99f7dcc70..de95baedb 100644
--- a/Source/CursesDialog/cmCursesBoolWidget.cxx
+++ b/Source/CursesDialog/cmCursesBoolWidget.cxx
@@ -11,7 +11,10 @@
 ============================================================================*/
 #include "cmCursesBoolWidget.h"
 
-#include "cmCursesMainForm.h"
+#include "cmCursesWidget.h"
+#include "cmState.h"
+
+#include <string>
 
 cmCursesBoolWidget::cmCursesBoolWidget(int width, int height, int left,
                                        int top)
diff --git a/Source/CursesDialog/cmCursesBoolWidget.h b/Source/CursesDialog/cmCursesBoolWidget.h
index d2899eeab..b9f1b1606 100644
--- a/Source/CursesDialog/cmCursesBoolWidget.h
+++ b/Source/CursesDialog/cmCursesBoolWidget.h
@@ -12,6 +12,9 @@
 #ifndef cmCursesBoolWidget_h
 #define cmCursesBoolWidget_h
 
+#include <cmConfigure.h>
+
+#include "cmCursesStandardIncludes.h"
 #include "cmCursesWidget.h"
 
 class cmCursesMainForm;
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
index 462cb6e94..d115c77e3 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
@@ -11,18 +11,20 @@
 ============================================================================*/
 #include "cmCursesCacheEntryComposite.h"
 
-#include "../cmState.h"
-#include "../cmSystemTools.h"
-#include "../cmake.h"
 #include "cmCursesBoolWidget.h"
-#include "cmCursesDummyWidget.h"
 #include "cmCursesFilePathWidget.h"
 #include "cmCursesLabelWidget.h"
 #include "cmCursesOptionsWidget.h"
 #include "cmCursesPathWidget.h"
 #include "cmCursesStringWidget.h"
+#include "cmCursesWidget.h"
+#include "cmState.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
 #include <assert.h>
+#include <cmConfigure.h>
+#include <vector>
 
 cmCursesCacheEntryComposite::cmCursesCacheEntryComposite(
   const std::string& key, int labelwidth, int entrywidth)
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.h b/Source/CursesDialog/cmCursesCacheEntryComposite.h
index c9c8238fa..c717e1ad5 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.h
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.h
@@ -12,8 +12,12 @@
 #ifndef cmCursesCacheEntryComposite_h
 #define cmCursesCacheEntryComposite_h
 
-#include "cmCursesLabelWidget.h"
+#include <cmConfigure.h> // IWYU pragma: keep
 
+#include <string>
+
+class cmCursesLabelWidget;
+class cmCursesWidget;
 class cmake;
 
 class cmCursesCacheEntryComposite
diff --git a/Source/CursesDialog/cmCursesDummyWidget.cxx b/Source/CursesDialog/cmCursesDummyWidget.cxx
index a96009015..fe73e7ef6 100644
--- a/Source/CursesDialog/cmCursesDummyWidget.cxx
+++ b/Source/CursesDialog/cmCursesDummyWidget.cxx
@@ -11,6 +11,9 @@
 ============================================================================*/
 #include "cmCursesDummyWidget.h"
 
+#include "cmCursesWidget.h"
+#include "cmState.h"
+
 cmCursesDummyWidget::cmCursesDummyWidget(int width, int height, int left,
                                          int top)
   : cmCursesWidget(width, height, left, top)
diff --git a/Source/CursesDialog/cmCursesDummyWidget.h b/Source/CursesDialog/cmCursesDummyWidget.h
index e6ca91eda..cf88e6ef4 100644
--- a/Source/CursesDialog/cmCursesDummyWidget.h
+++ b/Source/CursesDialog/cmCursesDummyWidget.h
@@ -12,6 +12,9 @@
 #ifndef cmCursesDummyWidget_h
 #define cmCursesDummyWidget_h
 
+#include <cmConfigure.h>
+
+#include "cmCursesStandardIncludes.h"
 #include "cmCursesWidget.h"
 
 class cmCursesMainForm;
diff --git a/Source/CursesDialog/cmCursesFilePathWidget.cxx b/Source/CursesDialog/cmCursesFilePathWidget.cxx
index 28a74a947..654e0d4e2 100644
--- a/Source/CursesDialog/cmCursesFilePathWidget.cxx
+++ b/Source/CursesDialog/cmCursesFilePathWidget.cxx
@@ -11,6 +11,9 @@
 ============================================================================*/
 #include "cmCursesFilePathWidget.h"
 
+#include "cmCursesPathWidget.h"
+#include "cmState.h"
+
 cmCursesFilePathWidget::cmCursesFilePathWidget(int width, int height, int left,
                                                int top)
   : cmCursesPathWidget(width, height, left, top)
diff --git a/Source/CursesDialog/cmCursesFilePathWidget.h b/Source/CursesDialog/cmCursesFilePathWidget.h
index 72adc770a..86c78cef9 100644
--- a/Source/CursesDialog/cmCursesFilePathWidget.h
+++ b/Source/CursesDialog/cmCursesFilePathWidget.h
@@ -12,6 +12,8 @@
 #ifndef cmCursesFilePathWidget_h
 #define cmCursesFilePathWidget_h
 
+#include <cmConfigure.h> // IWYU pragma: keep
+
 #include "cmCursesPathWidget.h"
 
 class cmCursesFilePathWidget : public cmCursesPathWidget
diff --git a/Source/CursesDialog/cmCursesForm.cxx b/Source/CursesDialog/cmCursesForm.cxx
index b3320c9f5..699dabc25 100644
--- a/Source/CursesDialog/cmCursesForm.cxx
+++ b/Source/CursesDialog/cmCursesForm.cxx
@@ -11,6 +11,8 @@
 ============================================================================*/
 #include "cmCursesForm.h"
 
+#include <cmConfigure.h>
+
 cmsys::ofstream cmCursesForm::DebugFile;
 bool cmCursesForm::Debug = false;
 
diff --git a/Source/CursesDialog/cmCursesForm.h b/Source/CursesDialog/cmCursesForm.h
index c0192fcfa..bf97c66bd 100644
--- a/Source/CursesDialog/cmCursesForm.h
+++ b/Source/CursesDialog/cmCursesForm.h
@@ -12,6 +12,8 @@
 #ifndef cmCursesForm_h
 #define cmCursesForm_h
 
+#include <cmConfigure.h> // IWYU pragma: keep
+
 #include "cmCursesStandardIncludes.h"
 
 #include <cmsys/FStream.hxx>
diff --git a/Source/CursesDialog/cmCursesLabelWidget.cxx b/Source/CursesDialog/cmCursesLabelWidget.cxx
index 784738bf0..0ed9240cb 100644
--- a/Source/CursesDialog/cmCursesLabelWidget.cxx
+++ b/Source/CursesDialog/cmCursesLabelWidget.cxx
@@ -11,6 +11,8 @@
 ============================================================================*/
 #include "cmCursesLabelWidget.h"
 
+#include "cmCursesWidget.h"
+
 cmCursesLabelWidget::cmCursesLabelWidget(int width, int height, int left,
                                          int top, const std::string& name)
   : cmCursesWidget(width, height, left, top)
diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h
index ff645aff2..990078b86 100644
--- a/Source/CursesDialog/cmCursesLabelWidget.h
+++ b/Source/CursesDialog/cmCursesLabelWidget.h
@@ -12,8 +12,13 @@
 #ifndef cmCursesLabelWidget_h
 #define cmCursesLabelWidget_h
 
+#include <cmConfigure.h>
+
+#include "cmCursesStandardIncludes.h"
 #include "cmCursesWidget.h"
 
+#include <string>
+
 class cmCursesMainForm;
 
 class cmCursesLabelWidget : public cmCursesWidget
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx
index 47f98a2c8..75b136c2c 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.cxx
+++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx
@@ -11,10 +11,13 @@
 ============================================================================*/
 #include "cmCursesLongMessageForm.h"
 
-#include "../cmSystemTools.h"
-#include "../cmVersion.h"
-#include "../cmake.h"
+#include "cmCursesForm.h"
 #include "cmCursesMainForm.h"
+#include "cmCursesStandardIncludes.h"
+#include "cmVersion.h"
+
+#include <stdio.h>
+#include <string.h>
 
 inline int ctrl(int z)
 {
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.h b/Source/CursesDialog/cmCursesLongMessageForm.h
index a12ed2f7b..f8e8544ae 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.h
+++ b/Source/CursesDialog/cmCursesLongMessageForm.h
@@ -12,11 +12,13 @@
 #ifndef cmCursesLongMessageForm_h
 #define cmCursesLongMessageForm_h
 
-#include "cmCursesStandardIncludes.h"
+#include <cmConfigure.h>
 
 #include "cmCursesForm.h"
+#include "cmCursesStandardIncludes.h"
 
-class cmCursesCacheEntryComposite;
+#include <string>
+#include <vector>
 
 class cmCursesLongMessageForm : public cmCursesForm
 {
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index 1d036c439..d8d1a7d8e 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -11,19 +11,22 @@
 ============================================================================*/
 #include "cmCursesMainForm.h"
 
-#include "../cmSystemTools.h"
-#include "../cmVersion.h"
-#include "../cmake.h"
 #include "cmAlgorithms.h"
-#include "cmCursesBoolWidget.h"
 #include "cmCursesCacheEntryComposite.h"
 #include "cmCursesDummyWidget.h"
-#include "cmCursesFilePathWidget.h"
+#include "cmCursesForm.h"
 #include "cmCursesLabelWidget.h"
 #include "cmCursesLongMessageForm.h"
-#include "cmCursesPathWidget.h"
+#include "cmCursesStandardIncludes.h"
 #include "cmCursesStringWidget.h"
+#include "cmCursesWidget.h"
 #include "cmState.h"
+#include "cmSystemTools.h"
+#include "cmVersion.h"
+#include "cmake.h"
+
+#include <stdio.h>
+#include <string.h>
 
 inline int ctrl(int z)
 {
@@ -742,8 +745,6 @@ void cmCursesMainForm::FixValue(cmState::CacheEntryType type,
   }
 }
 
-#include <unistd.h>
-
 void cmCursesMainForm::HandleInput()
 {
   int x = 0, y = 0;
diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h
index d17ee33f5..11409450a 100644
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@@ -12,13 +12,17 @@
 #ifndef cmCursesMainForm_h
 #define cmCursesMainForm_h
 
-#include "cmCursesStandardIncludes.h"
+#include <cmConfigure.h>
 
-#include "../cmState.h"
 #include "cmCursesForm.h"
+#include "cmCursesStandardIncludes.h"
+#include "cmState.h"
+
+#include <stddef.h>
+#include <string>
+#include <vector>
 
 class cmCursesCacheEntryComposite;
-class cmCursesWidget;
 class cmake;
 
 /** \class cmCursesMainForm
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.cxx b/Source/CursesDialog/cmCursesOptionsWidget.cxx
index 9a88aefc5..f7a8cc658 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.cxx
+++ b/Source/CursesDialog/cmCursesOptionsWidget.cxx
@@ -11,7 +11,8 @@
 ============================================================================*/
 #include "cmCursesOptionsWidget.h"
 
-#include "cmCursesMainForm.h"
+#include "cmCursesWidget.h"
+#include "cmState.h"
 
 #define ctrl(z) ((z)&037)
 
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.h b/Source/CursesDialog/cmCursesOptionsWidget.h
index f88b6bc65..80dccad99 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.h
+++ b/Source/CursesDialog/cmCursesOptionsWidget.h
@@ -12,8 +12,14 @@
 #ifndef cmCursesOptionsWidget_h
 #define cmCursesOptionsWidget_h
 
+#include <cmConfigure.h>
+
+#include "cmCursesStandardIncludes.h"
 #include "cmCursesWidget.h"
 
+#include <string>
+#include <vector>
+
 class cmCursesMainForm;
 
 class cmCursesOptionsWidget : public cmCursesWidget
diff --git a/Source/CursesDialog/cmCursesPathWidget.cxx b/Source/CursesDialog/cmCursesPathWidget.cxx
index 33fffd1fe..2ee64c73a 100644
--- a/Source/CursesDialog/cmCursesPathWidget.cxx
+++ b/Source/CursesDialog/cmCursesPathWidget.cxx
@@ -12,8 +12,12 @@
 #include "cmCursesPathWidget.h"
 
 #include "cmCursesMainForm.h"
+#include "cmCursesStringWidget.h"
+#include "cmState.h"
 #include "cmSystemTools.h"
 
+#include <vector>
+
 cmCursesPathWidget::cmCursesPathWidget(int width, int height, int left,
                                        int top)
   : cmCursesStringWidget(width, height, left, top)
diff --git a/Source/CursesDialog/cmCursesPathWidget.h b/Source/CursesDialog/cmCursesPathWidget.h
index cd26df636..0ffce0400 100644
--- a/Source/CursesDialog/cmCursesPathWidget.h
+++ b/Source/CursesDialog/cmCursesPathWidget.h
@@ -12,8 +12,15 @@
 #ifndef cmCursesPathWidget_h
 #define cmCursesPathWidget_h
 
+#include <cmConfigure.h>
+
+#include "cmCursesStandardIncludes.h"
 #include "cmCursesStringWidget.h"
 
+#include <string>
+
+class cmCursesMainForm;
+
 class cmCursesPathWidget : public cmCursesStringWidget
 {
 public:
diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
index 095397869..4929958d6 100644
--- a/Source/CursesDialog/cmCursesStandardIncludes.h
+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
@@ -14,8 +14,6 @@
 
 #include <cmConfigure.h>
 
-#include "../cmStandardIncludes.h"
-
 #if defined(__sun__) && defined(__GNUC__)
 #define _MSE_INT_H
 #endif
diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx
index db98a0063..726a12853 100644
--- a/Source/CursesDialog/cmCursesStringWidget.cxx
+++ b/Source/CursesDialog/cmCursesStringWidget.cxx
@@ -11,7 +11,14 @@
 ============================================================================*/
 #include "cmCursesStringWidget.h"
 
+#include "cmCursesForm.h"
 #include "cmCursesMainForm.h"
+#include "cmCursesStandardIncludes.h"
+#include "cmCursesWidget.h"
+#include "cmState.h"
+
+#include <stdio.h>
+#include <string.h>
 
 inline int ctrl(int z)
 {
diff --git a/Source/CursesDialog/cmCursesStringWidget.h b/Source/CursesDialog/cmCursesStringWidget.h
index c8ca4821f..2bcf7e6d7 100644
--- a/Source/CursesDialog/cmCursesStringWidget.h
+++ b/Source/CursesDialog/cmCursesStringWidget.h
@@ -12,8 +12,13 @@
 #ifndef cmCursesStringWidget_h
 #define cmCursesStringWidget_h
 
+#include <cmConfigure.h>
+
+#include "cmCursesStandardIncludes.h"
 #include "cmCursesWidget.h"
 
+#include <string>
+
 class cmCursesMainForm;
 
 /** \class cmCursesStringWidget
diff --git a/Source/CursesDialog/cmCursesWidget.cxx b/Source/CursesDialog/cmCursesWidget.cxx
index 49f27958e..ed76e7caa 100644
--- a/Source/CursesDialog/cmCursesWidget.cxx
+++ b/Source/CursesDialog/cmCursesWidget.cxx
@@ -11,6 +11,8 @@
 ============================================================================*/
 #include "cmCursesWidget.h"
 
+#include <cmConfigure.h>
+
 cmCursesWidget::cmCursesWidget(int width, int height, int left, int top)
 {
   this->Field = new_field(height, width, top, left, 0, 0);
diff --git a/Source/CursesDialog/cmCursesWidget.h b/Source/CursesDialog/cmCursesWidget.h
index 2ac5bb8f5..3f438af0f 100644
--- a/Source/CursesDialog/cmCursesWidget.h
+++ b/Source/CursesDialog/cmCursesWidget.h
@@ -12,9 +12,12 @@
 #ifndef cmCursesWidget_h
 #define cmCursesWidget_h
 
-#include "cmCursesStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
 
-#include "../cmState.h"
+#include "cmCursesStandardIncludes.h"
+#include "cmState.h"
+
+#include <string>
 
 class cmCursesMainForm;