fix EBN errors: header rearrangements, guards

svn path=/trunk/KDE/kdebase/apps/; revision=783227

nsplugins/test/testnsplugin.cpp

@@ -18,8 +18,11 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
-#include <stdio.h>
 
+#include "testnsplugin.h"
+#include "../nspluginloader.h"
+
+#include <stdio.h>
 
 #include <kactioncollection.h>
 //Added by qt3to4:
@@ -29,8 +32,6 @@
 #include <kstandardaction.h>
 #include <kaction.h>
 
-#include "testnsplugin.h"
-#include "../nspluginloader.h"
 
 
 TestNSPlugin::TestNSPlugin()

nsplugins/viewer/resolve.h

@@ -17,6 +17,8 @@
  
 */                                                                            
 
+#ifndef VIEWER_RESOLVE_H
+#define VIEWER_RESOLVE_H
 
 #define RESOLVE_RETVAL(fname,error)           \
   kDebug() << "NSPluginInstance::";  \
@@ -43,4 +45,5 @@
   kDebug() << "results in " << error;         \
   return error;
 
+#endif /* VIEWER_RESOLVE_H */