diff --git a/src/io/pipeer.h b/src/io/pipeer.h
index 379c5277..e2720aa4 100755
--- a/src/io/pipeer.h
+++ b/src/io/pipeer.h
@@ -42,8 +42,8 @@ private:
 		EVENT_HANDLER1(void, dtReceiveFinishedIn, bool, ok) {if (ok) received(name(), dt_in.data());}
 		EVENT_HANDLER1(void, dtReceiveFinishedOut, bool, ok) {if (ok) received(name(), dt_out.data());}
 		EVENT_HANDLER(void, dtThread);
-		EVENT2(received, const PIString &, from, const PIByteArray &, data);
-		EVENT2(sendRequest, const PIString &, to, const PIByteArray &, data);
+		EVENT2(received, const PIString &, from, const PIByteArray &, data)
+		EVENT2(sendRequest, const PIString &, to, const PIByteArray &, data)
 		bool send(const PIByteArray & d);
 		void receivedPacket(uchar type, const PIByteArray & d);
 		void setDist(int dist);
@@ -133,9 +133,9 @@ public:
 	void lock() {peers_mutex.lock();}
 	void unlock() {peers_mutex.unlock();}
 	
-	EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data);
-	EVENT1(peerConnectedEvent, const PIString &, name);
-	EVENT1(peerDisconnectedEvent, const PIString &, name);
+	EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data)
+	EVENT1(peerConnectedEvent, const PIString &, name)
+	EVENT1(peerDisconnectedEvent, const PIString &, name)
 	
 protected:
 	virtual void dataReceived(const PIString & from, const PIByteArray & data) {;}
diff --git a/src/system/piprocess.h b/src/system/piprocess.h
index ae7f00aa..d70b312f 100755
--- a/src/system/piprocess.h
+++ b/src/system/piprocess.h
@@ -1,23 +1,23 @@
 /*! \file piprocess.h
- * \brief Process
+* \brief Process
 */
 /*
-    PIP - Platform Independent Primitives
-    Process
-    Copyright (C) 2015  Ivan Pelipenko peri4ko@gmail.com
+	PIP - Platform Independent Primitives
+	Process
+	Copyright (C) 2015  Ivan Pelipenko peri4ko@gmail.com
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef PIPROCESS_H
@@ -80,7 +80,7 @@ public:
 	EVENT1(execStarted, PIString, program)
 	EVENT2(execFinished, PIString, program, int, exit_code)
 
-    static PIStringList currentEnvironment();
+	static PIStringList currentEnvironment();
 	static int currentPID();
 
 private:
@@ -94,7 +94,7 @@ private:
 	bool g_in, g_out, g_err, t_in, t_out, t_err;
 #ifdef WINDOWS
 	STARTUPINFOA si;
-    PROCESS_INFORMATION pi;
+	PROCESS_INFORMATION pi;
 #else
 	pid_t pid;
 #endif
diff --git a/utils/system_daemon/daemon.h b/utils/system_daemon/daemon.h
index 6571664f..20f7cc36 100644
--- a/utils/system_daemon/daemon.h
+++ b/utils/system_daemon/daemon.h
@@ -124,7 +124,7 @@ private:
 	EVENT_HANDLER2(void, filesReceived, const PIString & , name, bool, ok);
 	EVENT_HANDLER2(void, filesRemoved, const PIString & , name, const PIString & , dir);
 	EVENT_HANDLER2(void, closeFileDialog, const PIString & , name, bool, ok);
-	EVENT(menuRequest);
+	EVENT(menuRequest)
 	void hideAll();
 	void showTile(PIScreenTile * t, const PIString & header = PIString());
 	void fillInfoTile(const HostInfo & hi);