diff --git a/src/WINNT/netidmgr_plugin/afsconfigdlg.c b/src/WINNT/netidmgr_plugin/afsconfigdlg.c
index 93f4c2f05f..bcc82c108b 100644
--- a/src/WINNT/netidmgr_plugin/afsconfigdlg.c
+++ b/src/WINNT/netidmgr_plugin/afsconfigdlg.c
@@ -24,10 +24,6 @@
 
 /* $Id$ */
 
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<kherror.h>
 #include<khuidefs.h>
diff --git a/src/WINNT/netidmgr_plugin/afscred.h b/src/WINNT/netidmgr_plugin/afscred.h
index caf036e8ea..f4d75f1b22 100644
--- a/src/WINNT/netidmgr_plugin/afscred.h
+++ b/src/WINNT/netidmgr_plugin/afscred.h
@@ -33,6 +33,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
 
 #define _WINSOCKAPI_
 #include<windows.h>
diff --git a/src/WINNT/netidmgr_plugin/afsext.c b/src/WINNT/netidmgr_plugin/afsext.c
index d9a41d3298..2e07c31354 100644
--- a/src/WINNT/netidmgr_plugin/afsext.c
+++ b/src/WINNT/netidmgr_plugin/afsext.c
@@ -24,10 +24,6 @@
 
 /* $Id$ */
 
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<assert.h>
 #include<wchar.h>
diff --git a/src/WINNT/netidmgr_plugin/afsfuncs.c b/src/WINNT/netidmgr_plugin/afsfuncs.c
index 1b4e6d9cdb..93f8df3a42 100644
--- a/src/WINNT/netidmgr_plugin/afsfuncs.c
+++ b/src/WINNT/netidmgr_plugin/afsfuncs.c
@@ -29,11 +29,6 @@
 #pragma warning (push)
 #pragma warning (disable: 4005)
 
-
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<dynimport.h>
 #include<krb5common.h>
diff --git a/src/WINNT/netidmgr_plugin/afshelp.c b/src/WINNT/netidmgr_plugin/afshelp.c
index 316ea48556..30a7cc6195 100644
--- a/src/WINNT/netidmgr_plugin/afshelp.c
+++ b/src/WINNT/netidmgr_plugin/afshelp.c
@@ -26,11 +26,6 @@
 
 #define NOSTRSAFE
 
-
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<shlwapi.h>
 #include<htmlhelp.h>
diff --git a/src/WINNT/netidmgr_plugin/afsicon.c b/src/WINNT/netidmgr_plugin/afsicon.c
index bb0e18277f..54cb6dd85a 100644
--- a/src/WINNT/netidmgr_plugin/afsicon.c
+++ b/src/WINNT/netidmgr_plugin/afsicon.c
@@ -1,8 +1,4 @@
 
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #define NOSTRSAFE
 #include "afscred.h"
 #include "AFS_component_version_number.h"
diff --git a/src/WINNT/netidmgr_plugin/afsnewcreds.c b/src/WINNT/netidmgr_plugin/afsnewcreds.c
index 01dc909d39..e079550bf8 100644
--- a/src/WINNT/netidmgr_plugin/afsnewcreds.c
+++ b/src/WINNT/netidmgr_plugin/afsnewcreds.c
@@ -24,10 +24,6 @@
 
 /* $Id$ */
 
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<commctrl.h>
 #include<assert.h>
diff --git a/src/WINNT/netidmgr_plugin/afsplugin.c b/src/WINNT/netidmgr_plugin/afsplugin.c
index 8a697b3b44..89cb2b4f57 100644
--- a/src/WINNT/netidmgr_plugin/afsplugin.c
+++ b/src/WINNT/netidmgr_plugin/afsplugin.c
@@ -24,10 +24,6 @@
 
 /* $Id$ */
 
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<kcreddb.h>
 #include<khmsgtypes.h>
diff --git a/src/WINNT/netidmgr_plugin/main.c b/src/WINNT/netidmgr_plugin/main.c
index 2cd96f07ac..9164590345 100644
--- a/src/WINNT/netidmgr_plugin/main.c
+++ b/src/WINNT/netidmgr_plugin/main.c
@@ -29,11 +29,6 @@
 #pragma warning (push)
 #pragma warning (disable: 4005)
 
-
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<kmm.h>
 #include<dynimport.h>