diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 00bcd528a..4703218a4 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -3,8 +3,6 @@
 
 #include "kmcomposewin.h"
 #include "KEdit.h"
-#include "kmglobal.h"
-#include "kmmainwin.h"
 #include "kmmessage.h"
 #include "kmmsgpart.h"
 #include "kmsender.h"
@@ -41,6 +39,22 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#ifdef KRN
+/* start added for KRN */
+extern KLocale *nls;
+extern KStdAccel* keys;
+extern KApplication *app;
+extern KBusyPtr *kbp;
+extern KMSender *msgSender;
+extern KMIdentity *identity;
+#define aboutText "KRN"
+/* end added for KRN */
+#else
+#include "kmglobal.h"
+#include "kmmainwin.h"
+#endif
+
+
 #include "kmcomposewin.moc"
 
 
diff --git a/kmmsgbase.cpp b/kmmsgbase.cpp
index ad3fc69f2..e65e88195 100644
--- a/kmmsgbase.cpp
+++ b/kmmsgbase.cpp
@@ -1,9 +1,12 @@
 // kmmsgbase.cpp
 
 #include "kmmsgbase.h"
-#include "kmfolder.h"
 #include <mimelib/mimepp.h>
 #include <qregexp.h>
+#ifndef KRN
+#include <kmfolder.h>
+#endif
+
 
 #define NUM_STATUSLIST 7
 static KMMsgStatus sStatusList[NUM_STATUSLIST+1] = 
@@ -66,7 +69,9 @@ void KMMsgBase::setStatus(KMMsgStatus aStatus)
 {
   mStatus = aStatus;
   mDirty = TRUE;
+#ifndef KRN
   if (mParent) mParent->headerOfMsgChanged(this);
+#endif
 }
 
 
@@ -80,7 +85,9 @@ void KMMsgBase::setStatus(const char* aStatusStr)
 
   mStatus = sStatusList[i];
   mDirty = TRUE;
+#ifndef KRN
   if (mParent) mParent->headerOfMsgChanged(this);
+#endif
 }