diff --git a/src/ws.h b/src/ws.h
index 7b1cdbd..6b211da 100644
--- a/src/ws.h
+++ b/src/ws.h
@@ -44,8 +44,6 @@
 #include <boost/program_options.hpp>
 #include <boost/smart_ptr.hpp>
 
-#include "wsdb.h"
-
 #ifndef SETUID
 #include <sys/capability.h>
 #else
diff --git a/src/ws_allocate.cpp b/src/ws_allocate.cpp
index 82270ad..6cb983d 100644
--- a/src/ws_allocate.cpp
+++ b/src/ws_allocate.cpp
@@ -285,8 +285,6 @@ int main(int argc, char **argv) {
     reminderdefault = config["reminderdefault"].as<int>(0);
     durationdefault = config["durationdefault"].as<int>(1);
 
-    int db_uid = config["dbuid"].as<int>();
-
     // read user config before dropping privileges to DB user
     //
     // get user first, so user config is read as owner
@@ -303,13 +301,6 @@ int main(int argc, char **argv) {
         exit(-1);
     }
 
-    /*
-    Workspace::raise_cap(CAP_DAC_OVERRIDE);
-
-    // lower capabilities to minimum
-    Workspace::drop_cap(CAP_DAC_OVERRIDE, db_uid);
-    */
-
     // check commandline, get flags which are used to create ws object or for workspace allocation
     commandline(opt, name, duration, durationdefault , filesystem, extensionflag, 
 				reminder, reminderdefault, mailaddress, user_option, groupname, comment, argc, argv, user_conf);
diff --git a/src/ws_restore.cpp b/src/ws_restore.cpp
index c2d7cd4..a35ec56 100644
--- a/src/ws_restore.cpp
+++ b/src/ws_restore.cpp
@@ -35,11 +35,13 @@
 #include <unistd.h>
 #include <grp.h>
 #include <sys/types.h>
-#include <time.h>
 #include <syslog.h>
 
+#include <algorithm>
+#include <ctime>
 #include <iostream>
 #include <string>
+#include <vector>
 #ifdef USE_BOOST_REGEXP
     #include <boost/regex.hpp>
     #define REGEX boost::regex
diff --git a/src/wsdb.cpp b/src/wsdb.cpp
index 8ff7e7e..44c6f4c 100644
--- a/src/wsdb.cpp
+++ b/src/wsdb.cpp
@@ -34,13 +34,10 @@
 #include <string>
 #include <fstream>
 #include <iostream>
+#include <vector>
 
 // Posix
-#include <sys/types.h>
-#include <pwd.h>
 #include <unistd.h>
-#include <grp.h>
-#include <time.h>
 #include <sys/stat.h>
 #include <signal.h>