diff --git a/dist/cdk/include/alphalist.h b/dist/cdk/include/alphalist.h
index e364172722c1..56caffa4bf05 100644
--- a/dist/cdk/include/alphalist.h
+++ b/dist/cdk/include/alphalist.h
@@ -1,9 +1,9 @@
 #ifndef CDKALPHALIST_H
 #define CDKALPHALIST_H	1
 
-#include <cdk.h>
-#include <entry.h>
-#include <scroll.h>
+#include <cdk/cdk.h>
+#include <cdk/entry.h>
+#include <cdk/scroll.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/binding.h b/dist/cdk/include/binding.h
index e7ea4c26f8ea..6c00866cf8fc 100644
--- a/dist/cdk/include/binding.h
+++ b/dist/cdk/include/binding.h
@@ -1,7 +1,7 @@
 #ifndef CDKBINDING_H
 #define CDKBINDING_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Copyright 1999, Mike Glover
diff --git a/dist/cdk/include/buttonbox.h b/dist/cdk/include/buttonbox.h
index 3552b71d0375..f418ae740a5a 100644
--- a/dist/cdk/include/buttonbox.h
+++ b/dist/cdk/include/buttonbox.h
@@ -1,7 +1,7 @@
 #ifndef CDKBUTTONBOX_H
 #define CDKBUTTONBOX_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/calendar.h b/dist/cdk/include/calendar.h
index 8e4b5f578416..bbe1bd369bf9 100644
--- a/dist/cdk/include/calendar.h
+++ b/dist/cdk/include/calendar.h
@@ -1,7 +1,7 @@
 #ifndef CDKCALENDAR_H
 #define CDKCALENDAR_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/cdk.h b/dist/cdk/include/cdk.h
index 0728c90f3165..25ef6b66b44a 100644
--- a/dist/cdk/include/cdk.h
+++ b/dist/cdk/include/cdk.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <cdk_config.h>
+#include <cdk/cdk_config.h>
 
 #ifdef	CDK_PERL_EXT
 #undef	instr
@@ -232,37 +232,37 @@ void stopCDKDebug (FILE *fd);
 /*
  * These header files define miscellaneous values and prototypes.
  */
-#include <cdkscreen.h>
-#include <curdefs.h>
-#include <binding.h>
-#include <cdk_util.h>
-#include <cdk_objs.h>
+#include <cdk/cdkscreen.h>
+#include <cdk/curdefs.h>
+#include <cdk/binding.h>
+#include <cdk/cdk_util.h>
+#include <cdk/cdk_objs.h>
 
 /*
  * Include the CDK widget header files.
  */
-#include <alphalist.h>
-#include <buttonbox.h>
-#include <calendar.h>
-#include <dialog.h>
-#include <entry.h>
-#include <fselect.h>
-#include <graph.h>
-#include <histogram.h>
-#include <itemlist.h>
-#include <label.h>
-#include <marquee.h>
-#include <matrix.h>
-#include <mentry.h>
-#include <menu.h>
-#include <radio.h>
-#include <scale.h>
-#include <scroll.h>
-#include <selection.h>
-#include <slider.h>
-#include <swindow.h>
-#include <template.h>
-#include <viewer.h>
-#include <draw.h>
+#include <cdk/alphalist.h>
+#include <cdk/buttonbox.h>
+#include <cdk/calendar.h>
+#include <cdk/dialog.h>
+#include <cdk/entry.h>
+#include <cdk/fselect.h>
+#include <cdk/graph.h>
+#include <cdk/histogram.h>
+#include <cdk/itemlist.h>
+#include <cdk/label.h>
+#include <cdk/marquee.h>
+#include <cdk/matrix.h>
+#include <cdk/mentry.h>
+#include <cdk/menu.h>
+#include <cdk/radio.h>
+#include <cdk/scale.h>
+#include <cdk/scroll.h>
+#include <cdk/selection.h>
+#include <cdk/slider.h>
+#include <cdk/swindow.h>
+#include <cdk/template.h>
+#include <cdk/viewer.h>
+#include <cdk/draw.h>
 
 #endif /* CDK_H */
diff --git a/dist/cdk/include/cdk_util.h b/dist/cdk/include/cdk_util.h
index b2a1f04fa16f..406faf070019 100644
--- a/dist/cdk/include/cdk_util.h
+++ b/dist/cdk/include/cdk_util.h
@@ -1,7 +1,7 @@
 #ifndef CDKUTIL_H
 #define CDKUTIL_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Copyright 1999, Mike Glover
diff --git a/dist/cdk/include/cdkscreen.h b/dist/cdk/include/cdkscreen.h
index d4814986878e..d1bed778d702 100644
--- a/dist/cdk/include/cdkscreen.h
+++ b/dist/cdk/include/cdkscreen.h
@@ -1,7 +1,7 @@
 #ifndef CDKSCREEN_H
 #define CDKSCREEN_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Copyright 1999, Mike Glover
diff --git a/dist/cdk/include/dialog.h b/dist/cdk/include/dialog.h
index 42e7361432d5..1031f1116070 100644
--- a/dist/cdk/include/dialog.h
+++ b/dist/cdk/include/dialog.h
@@ -1,7 +1,7 @@
 #ifndef CDKDIALOG_H
 #define CDKDIALOG_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/draw.h b/dist/cdk/include/draw.h
index 5144c49ed8c0..9a6177d2d55b 100644
--- a/dist/cdk/include/draw.h
+++ b/dist/cdk/include/draw.h
@@ -1,7 +1,7 @@
 #ifndef CDKDRAW_H
 #define CDKDRAW_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Copyright 1999, Mike Glover
diff --git a/dist/cdk/include/entry.h b/dist/cdk/include/entry.h
index 81a7fd4d81d1..f5b46fcfe7a1 100644
--- a/dist/cdk/include/entry.h
+++ b/dist/cdk/include/entry.h
@@ -1,7 +1,7 @@
 #ifndef CDKENTRY_H
 #define CDKENTRY_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/fselect.h b/dist/cdk/include/fselect.h
index ad5dfeb82e41..cedd1b5b01dd 100644
--- a/dist/cdk/include/fselect.h
+++ b/dist/cdk/include/fselect.h
@@ -1,7 +1,7 @@
 #ifndef CDKFSELECT_H
 #define CDKFSELECT_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
@@ -41,8 +41,8 @@
  * SUCH DAMAGE.
  */
 
-#include <label.h>
-#include <entry.h>
+#include <cdk/label.h>
+#include <cdk/entry.h>
 
 /*
  * Define the CDK file selector widget structure.
diff --git a/dist/cdk/include/graph.h b/dist/cdk/include/graph.h
index 19175c2bffe5..f75f976d582f 100644
--- a/dist/cdk/include/graph.h
+++ b/dist/cdk/include/graph.h
@@ -1,7 +1,7 @@
 #ifndef CDKGRAPH_H
 #define CDKGRAPH_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/histogram.h b/dist/cdk/include/histogram.h
index c3b857d477bc..24b3f827a3c1 100644
--- a/dist/cdk/include/histogram.h
+++ b/dist/cdk/include/histogram.h
@@ -1,7 +1,7 @@
 #ifndef CDKHISTOGRAM_H
 #define CDKHISTOGRAM_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/itemlist.h b/dist/cdk/include/itemlist.h
index 185457905661..b4cf59f6292e 100644
--- a/dist/cdk/include/itemlist.h
+++ b/dist/cdk/include/itemlist.h
@@ -1,7 +1,7 @@
 #ifndef CDKITEMLIST_H
 #define CDKITEMLIST_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/label.h b/dist/cdk/include/label.h
index 5fd2e4097660..d4cae8f92e9c 100644
--- a/dist/cdk/include/label.h
+++ b/dist/cdk/include/label.h
@@ -1,7 +1,7 @@
 #ifndef CDKLABEL_H
 #define CDKLABEL_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/marquee.h b/dist/cdk/include/marquee.h
index 8ad51e970ddc..1425ba873b45 100644
--- a/dist/cdk/include/marquee.h
+++ b/dist/cdk/include/marquee.h
@@ -1,7 +1,7 @@
 #ifndef CDKMARQUEE_H
 #define CDKMARQUEE_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/matrix.h b/dist/cdk/include/matrix.h
index 982ce115ef9a..a82ec6397311 100644
--- a/dist/cdk/include/matrix.h
+++ b/dist/cdk/include/matrix.h
@@ -1,7 +1,7 @@
 #ifndef CDKMATRIX_H
 #define CDKMATRIX_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/mentry.h b/dist/cdk/include/mentry.h
index d52a555743a5..d9ae6de572a3 100644
--- a/dist/cdk/include/mentry.h
+++ b/dist/cdk/include/mentry.h
@@ -1,7 +1,7 @@
 #ifndef CDKMENTRY_H
 #define CDKMENTRY_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/menu.h b/dist/cdk/include/menu.h
index b2fe9c9359e1..ec2216c9b8b3 100644
--- a/dist/cdk/include/menu.h
+++ b/dist/cdk/include/menu.h
@@ -1,7 +1,7 @@
 #ifndef CDKMENU_H
 #define CDKMENU_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Copyright 1999, Mike Glover
diff --git a/dist/cdk/include/radio.h b/dist/cdk/include/radio.h
index 6b41789bf763..80ed66ef1d59 100644
--- a/dist/cdk/include/radio.h
+++ b/dist/cdk/include/radio.h
@@ -1,7 +1,7 @@
 #ifndef CDKRADIO_H
 #define CDKRADIO_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/scale.h b/dist/cdk/include/scale.h
index 04b0386c4865..56e98f699bb4 100644
--- a/dist/cdk/include/scale.h
+++ b/dist/cdk/include/scale.h
@@ -1,7 +1,7 @@
 #ifndef CDKSCALE_H
 #define CDKSCALE_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/scroll.h b/dist/cdk/include/scroll.h
index a7524086a69f..31a93f5a9554 100644
--- a/dist/cdk/include/scroll.h
+++ b/dist/cdk/include/scroll.h
@@ -1,7 +1,7 @@
 #ifndef CDKSCROLL_H
 #define CDKSCROLL_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/selection.h b/dist/cdk/include/selection.h
index 2fa87eab1662..6e3fcc91db7e 100644
--- a/dist/cdk/include/selection.h
+++ b/dist/cdk/include/selection.h
@@ -1,7 +1,7 @@
 #ifndef CDKSELECTION_H
 #define CDKSELECTION_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/slider.h b/dist/cdk/include/slider.h
index f5453a3baebc..b151064dff43 100644
--- a/dist/cdk/include/slider.h
+++ b/dist/cdk/include/slider.h
@@ -1,7 +1,7 @@
 #ifndef CDKSLIDER_H
 #define CDKSLIDER_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/swindow.h b/dist/cdk/include/swindow.h
index 9fee826ba5c4..5d2fa3ce2e01 100644
--- a/dist/cdk/include/swindow.h
+++ b/dist/cdk/include/swindow.h
@@ -1,7 +1,7 @@
 #ifndef CDKSWINDOW_H
 #define CDKSWINDOW_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/template.h b/dist/cdk/include/template.h
index 7237bb2bb247..b883e5891b47 100644
--- a/dist/cdk/include/template.h
+++ b/dist/cdk/include/template.h
@@ -1,7 +1,7 @@
 #ifndef CDKTEMPLATE_H
 #define CDKTEMPLATE_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget:
diff --git a/dist/cdk/include/viewer.h b/dist/cdk/include/viewer.h
index f4092053242f..6dd11743d0a4 100644
--- a/dist/cdk/include/viewer.h
+++ b/dist/cdk/include/viewer.h
@@ -1,7 +1,7 @@
 #ifndef CDKVIEWER_H
 #define CDKVIEWER_H	1
 
-#include <cdk.h>
+#include <cdk/cdk.h>
 
 /*
  * Description of the widget: