diff --git a/mozilla/cck/driver/ProgDlgThread.cpp b/mozilla/cck/driver/ProgDlgThread.cpp
index 3fa08e903cb..e900e81d8a4 100644
--- a/mozilla/cck/driver/ProgDlgThread.cpp
+++ b/mozilla/cck/driver/ProgDlgThread.cpp
@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "WizardMachine.h"
+#include "WizardMachineDlg.h"
 #include "ProgDlgThread.h"
 
 #ifdef _DEBUG
diff --git a/mozilla/cck/driver/ProgressDialog.cpp b/mozilla/cck/driver/ProgressDialog.cpp
index 082b34b6e81..77837be7bf0 100644
--- a/mozilla/cck/driver/ProgressDialog.cpp
+++ b/mozilla/cck/driver/ProgressDialog.cpp
@@ -21,7 +21,7 @@
 
 #include "stdafx.h"
 #include "WizardMachine.h"
-//#include "ProgressDialog.h"
+#include "ProgressDialog.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
diff --git a/mozilla/cck/driver/PropSheet.cpp b/mozilla/cck/driver/PropSheet.cpp
index 91ca7607f22..8a48edeb35d 100644
--- a/mozilla/cck/driver/PropSheet.cpp
+++ b/mozilla/cck/driver/PropSheet.cpp
@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "WizardMachine.h"
+#include "PropSheet.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
diff --git a/mozilla/cck/driver/PropSheet.h b/mozilla/cck/driver/PropSheet.h
index 9a5ee324978..d8011f23676 100644
--- a/mozilla/cck/driver/PropSheet.h
+++ b/mozilla/cck/driver/PropSheet.h
@@ -21,7 +21,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CPropSheet
-#include "WizardUI.h"
+//#include "WizardUI.h"
 
 class CPropSheet : public CPropertySheet
 {
diff --git a/mozilla/cck/driver/WizardMachine.aps b/mozilla/cck/driver/WizardMachine.aps
index 7bbcc0f9dd3..e57861dbaaa 100644
Binary files a/mozilla/cck/driver/WizardMachine.aps and b/mozilla/cck/driver/WizardMachine.aps differ
diff --git a/mozilla/cck/driver/WizardMachine.cpp b/mozilla/cck/driver/WizardMachine.cpp
index 061c5ea80fe..d532302d168 100644
--- a/mozilla/cck/driver/WizardMachine.cpp
+++ b/mozilla/cck/driver/WizardMachine.cpp
@@ -34,6 +34,7 @@
 #include "NewDialog.h"
 #include "NewConfigDialog.h"
 #include "ProgDlgThread.h"
+#include "PropSheet.h"
 
 // for CopyDir
 #include "winbase.h"  
diff --git a/mozilla/cck/driver/WizardMachine.h b/mozilla/cck/driver/WizardMachine.h
index 5711fa80c50..797d5c3f6e7 100644
--- a/mozilla/cck/driver/WizardMachine.h
+++ b/mozilla/cck/driver/WizardMachine.h
@@ -24,7 +24,7 @@
 #endif
 
 #include "resource.h"		// main symbols
-#include "WizardMachineDlg.h"
+//#include "WizardMachineDlg.h"
 #include "WizardTypes.h"
 
 
diff --git a/mozilla/cck/driver/WizardMachine.mak b/mozilla/cck/driver/WizardMachine.mak
index 95ec7466a65..d9110b201a9 100644
--- a/mozilla/cck/driver/WizardMachine.mak
+++ b/mozilla/cck/driver/WizardMachine.mak
@@ -1,6 +1,6 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on WizardMachine.dsp
 !IF "$(CFG)" == ""
-CFG=WizardMachine - Win32 Release
+CFG=WizardMachine - Win32 Debug 
 !MESSAGE No configuration specified. Defaulting to WizardMachine - Win32 Release.
 !ENDIF 
 
diff --git a/mozilla/cck/driver/WizardMachine.ncb b/mozilla/cck/driver/WizardMachine.ncb
index 4030559a35e..8aa5422e4b3 100644
Binary files a/mozilla/cck/driver/WizardMachine.ncb and b/mozilla/cck/driver/WizardMachine.ncb differ
diff --git a/mozilla/cck/driver/WizardMachineDlg.cpp b/mozilla/cck/driver/WizardMachineDlg.cpp
index 0d881b1a8f6..6a219fe95e7 100644
--- a/mozilla/cck/driver/WizardMachineDlg.cpp
+++ b/mozilla/cck/driver/WizardMachineDlg.cpp
@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "WizardMachine.h"
+#include "WizardMachineDlg.h"
 //#include "ImageDialog.h"
 #include "ImgDlg.h"
 
diff --git a/mozilla/cck/driver/WizardUI.cpp b/mozilla/cck/driver/WizardUI.cpp
index f1ec2012984..d0fdf2005e4 100644
--- a/mozilla/cck/driver/WizardUI.cpp
+++ b/mozilla/cck/driver/WizardUI.cpp
@@ -21,8 +21,9 @@
 //
 
 #include "stdafx.h"
+#include "afxmt.h"
+
 #include "WizardMachine.h"
-//#include "ImageDialog.h"
 #include "fstream.h"
 #include "ImgDlg.h"
 #include "SumDlg.h"
@@ -30,15 +31,16 @@
 #include "NewDialog.h"
 #include "NewConfigDialog.h"
 #include "ProgDlgThread.h"
+#include "PropSheet.h"
+#include "WizardUI.h"
+
 #include <direct.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
 // The following is included to make 
 // the browse for a dir code compile
 #include <shlobj.h>
 
-
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE
diff --git a/mozilla/cck/driver/makefile.win b/mozilla/cck/driver/makefile.win
index af97a9f0913..ec32bbd9ce2 100644
--- a/mozilla/cck/driver/makefile.win
+++ b/mozilla/cck/driver/makefile.win
@@ -42,6 +42,8 @@ LLFLAGS = \
 INCS = -I. \
 	$(INCS)
 
+#	.\$(OBJDIR)\Interpret.obj \
+
 OBJS = \
 	.\$(OBJDIR)\HelpDlg.obj \
 	.\$(OBJDIR)\ImageDialog.obj \