diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am
index 50360bc2115ecadfa7f8df2da681e9ba3fe9b2c0..045fabc8f5220e7894317ac9f95bcc6d7b528c2c 100644
--- a/daemon/src/Makefile.am
+++ b/daemon/src/Makefile.am
@@ -84,8 +84,6 @@ libsflphone_la_SOURCES = conference.cpp \
 		logger.cpp \
 		numbercleaner.cpp \
 		fileutils.cpp \
-		scoped_lock.cpp \
-		scoped_lock.h \
 		sflthread.cpp \
 		sflthread.h \
 		conference.h \
diff --git a/daemon/src/scoped_lock.cpp b/daemon/src/scoped_lock.cpp
deleted file mode 100644
index a816f8a98e4ee7f6c1dce8dc2767558b3841539e..0000000000000000000000000000000000000000
--- a/daemon/src/scoped_lock.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (C) 2012-2013 Savoir-Faire Linux Inc.
- *  Author: Tristan Matthews <tristan.matthews@savoirfairelinux.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 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, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
- */
-
-#include "scoped_lock.h"
-
-namespace sfl {
-
-ScopedLock::ScopedLock(pthread_mutex_t &mutex) : mutex_(mutex) {
-    pthread_mutex_lock(&mutex_);
-}
-
-ScopedLock::ScopedLock(pthread_mutex_t &mutex, bool &acquired) : mutex_(mutex) {
-    acquired = (pthread_mutex_trylock(&mutex_) == 0);
-}
-
-
-ScopedLock::~ScopedLock() {
-    pthread_mutex_unlock(&mutex_);
-}
-
-}
diff --git a/daemon/src/scoped_lock.h b/daemon/src/scoped_lock.h
deleted file mode 100644
index 318f8a406dc9d1a35edb8c53b0f535af5db49665..0000000000000000000000000000000000000000
--- a/daemon/src/scoped_lock.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (C) 2012-2013 Savoir-Faire Linux Inc.
- *  Author: Tristan Matthews <tristan.matthews@savoirfairelinux.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 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, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
- */
-
-#ifndef SCOPED_LOCK_H_
-#define SCOPED_LOCK_H_
-
-#include <pthread.h>
-
-/**
- * @file scoped_lock.h
- * @brief Helper class to allow exception-safe mutex locking/unlocking.
- * Note that the mutex does not belong to this class.
- */
-namespace sfl {
-
-class ScopedLock {
-    public:
-        explicit ScopedLock(pthread_mutex_t &mutex);
-        // acquired will be set to true if the mutex was locked immediately
-        ScopedLock(pthread_mutex_t &mutex, bool &acquired);
-        ~ScopedLock();
-
-    private:
-        pthread_mutex_t &mutex_;
-};
-
-}
-
-#endif  // SCOPED_LOCK_H_