2 files changed, 6 insertions, 9 deletions

diff --git a/noncore/apps/zsafe/zsafe.h b/noncore/apps/zsafe/zsafe.h
index b5019a9..eef5cdc 100644
--- a/noncore/apps/zsafe/zsafe.h
+++ b/noncore/apps/zsafe/zsafe.h
@@ -12,12 +12,9 @@
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 #ifndef ZSAFE_H
 #define ZSAFE_H
-

-#ifndef WIN32
-#include <stream.h>

-#endif
+
 #include <stdio.h>
 
 #include "infoform.h"
 #include "categorylist.h"
@@ -35,11 +32,11 @@ class ZListView;
 class QListViewItem;
 class QToolButton;
 class QTextBrowser;
 class QPopupMenu;
-#ifdef DESKTOP

+#ifdef DESKTOP
 // #ifndef WIN32
-class QSettings;

+class QSettings;
 // #endif
 #else
 class Config;
 #endif
@@ -121,11 +118,11 @@ public:
     /** these two are global because save_entry() and save_finalize() both n eed them */
     int bufferIndex;
     unsigned short plaintext[4];
 
-#ifdef DESKTOP

+#ifdef DESKTOP
 // #ifndef WIN32
-    QSettings *conf;

+    QSettings *conf;
 // #endif
 #else
     Config *conf;
 #endif
diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro
index a1f9e9f..65bcb79 100644
--- a/noncore/apps/zsafe/zsafe.pro
+++ b/noncore/apps/zsafe/zsafe.pro
@@ -9,9 +9,9 @@ SOURCES      = main.cpp zsafe.cpp krc2.cpp category.cpp \
                scqtfiledlg.cpp
 INTERFACES	 = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS        += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopie -lstdc++
+LIBS        += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopie
 TARGET		 = zsafe
 
 include ( $(OPIEDIR)/include.pro )