diff --git a/evoke/EvokeService.cpp b/evoke/EvokeService.cpp
index 7aa1932..bd73b4c 100644
--- a/evoke/EvokeService.cpp
+++ b/evoke/EvokeService.cpp
@@ -20,6 +20,7 @@
 #include <edelib/StrUtil.h>
 #include <edelib/MessageBox.h>
 #include <edelib/Nls.h>
+#include <edelib/Run.h>
 
 #include "EvokeService.h"
 #include "Splash.h"
@@ -39,8 +40,8 @@ EDELIB_NS_USING(str_trim)
  #define CONFIG_GET_STRVAL(object, section, key, buff) object.get(section, key, buff, sizeof(buff), RES_SYS_ONLY)
 #endif
 
-static Atom XA_EDE_EVOKE_SHUTDOWN_ALL;
-static Atom XA_EDE_EVOKE_QUIT;
+static Atom   XA_EDE_EVOKE_SHUTDOWN_ALL;
+static Atom   XA_EDE_EVOKE_QUIT;
 
 static int get_int_property_value(Atom at) {
 	Atom real;
diff --git a/evoke/EvokeService.h b/evoke/EvokeService.h
index 9951f5b..c0a3449 100644
--- a/evoke/EvokeService.h
+++ b/evoke/EvokeService.h
@@ -29,32 +29,32 @@ typedef edelib::list<StartupItem*>::iterator StartupItemListIter;
 class Xsm;
 
 class EvokeService {
-	private:
-		char*           lock_name;
-		Xsm*            xsm;
-		bool            is_running;
-		StartupItemList startup_items;
-		edelib::String  splash_theme;
+private:
+	char*           lock_name;
+	Xsm*            xsm;
+	bool            is_running;
+	StartupItemList startup_items;
+	edelib::String  splash_theme;
 
-		void clear_startup_items(void);
-	public:
-		EvokeService();
-		~EvokeService();
-		static EvokeService* instance(void);
+	void clear_startup_items(void);
+public:
+	EvokeService();
+	~EvokeService();
+	static EvokeService* instance(void);
 
-		bool setup_lock(const char* name);
-		void remove_lock(void);
+	bool setup_lock(const char* name);
+	void remove_lock(void);
 
-		void start(void)   { is_running = true; }
-		void stop(void)    { is_running = false; }
-		bool running(void) { return is_running; }
+	void start(void)   { is_running = true; }
+	void stop(void)    { is_running = false; }
+	bool running(void) { return is_running; }
 
-		void read_startup(void);
-		void run_startup(bool splash, bool dryrun);
-		int handle(const XEvent* xev);
+	void read_startup(void);
+	void run_startup(bool splash, bool dryrun);
+	int handle(const XEvent* xev);
 
-		void start_xsettings_manager(void);
-		void stop_xsettings_manager(bool serialize);
+	void start_xsettings_manager(void);
+	void stop_xsettings_manager(bool serialize);
 };
 
 #endif
diff --git a/evoke/Splash.h b/evoke/Splash.h
index 63e08ea..148aab7 100644
--- a/evoke/Splash.h
+++ b/evoke/Splash.h
@@ -19,29 +19,29 @@
 #include "EvokeService.h"
 
 class Splash : public Fl_Double_Window {
-	private:
-		StartupItemList*     slist;
-		StartupItemListIter  slist_it;
-		edelib::String*      splash_theme;      
+private:
+	StartupItemList*     slist;
+	StartupItemListIter  slist_it;
+	edelib::String*      splash_theme;      
 
-		unsigned int counter;
-		bool         show_splash;
-		bool         dryrun;
+	unsigned int counter;
+	bool         show_splash;
+	bool         dryrun;
 
-		Fl_Box*      msgbox;
-		Fl_Box**     icons;
+	Fl_Box*      msgbox;
+	Fl_Box**     icons;
 
-	public:
-		Splash(StartupItemList& s, edelib::String& theme, bool show_it, bool dr);
-		~Splash();
+public:
+	Splash(StartupItemList& s, edelib::String& theme, bool show_it, bool dr);
+	~Splash();
 
-		bool next_client(void);
-		bool next_client_nosplash(void);
+	bool next_client(void);
+	bool next_client_nosplash(void);
 
-		void run(void);
+	void run(void);
 
 #if EDEWM_HAVE_NET_SPLASH
-		virtual void show(void);
+	virtual void show(void);
 #endif
 };
 
diff --git a/evoke/Xsm.h b/evoke/Xsm.h
index c512c88..1411c5c 100644
--- a/evoke/Xsm.h
+++ b/evoke/Xsm.h
@@ -20,17 +20,17 @@
  * Also it will write/undo to xrdb (X Resource database).
  */
 class Xsm : public edelib::XSettingsManager {
-	public:
-		Xsm();
-		~Xsm();
+public:
+	Xsm();
+	~Xsm();
 
-		bool load_serialized(void);
-		bool save_serialized(void);
+	bool load_serialized(void);
+	bool save_serialized(void);
 
-		/* replace XResource values from one from XSETTINGS */
-		void xresource_replace(void);
-		/* undo old XResource values */
-		void xresource_undo(void);
+	/* replace XResource values from one from XSETTINGS */
+	void xresource_replace(void);
+	/* undo old XResource values */
+	void xresource_undo(void);
 };
 
 #endif