diff --git a/cli/cli.pro b/cli/cli.pro
index 0ce00d2a0..536337268 100644
--- a/cli/cli.pro
+++ b/cli/cli.pro
@@ -1,14 +1,18 @@
 TEMPLATE = app
 TARGET = cppcheck
 DEPENDPATH += .
-INCLUDEPATH += .
+INCLUDEPATH += . ../lib
 OBJECTS_DIR = temp
 CONFIG += warn_on
 CONFIG -= qt app_bundle
 
 include($$PWD/../lib/lib.pri)
 
-SOURCES += main.cpp
+SOURCES += main.cpp \
+           cppcheckexecutor.cpp \
+           threadexecutor.cpp
+HEADERS += cppcheckexecutor.cpp \
+           threadexecutor.cpp
 
 win32 {
     CONFIG += embed_manifest_exe console
diff --git a/lib/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
similarity index 100%
rename from lib/cppcheckexecutor.cpp
rename to cli/cppcheckexecutor.cpp
diff --git a/lib/cppcheckexecutor.h b/cli/cppcheckexecutor.h
similarity index 100%
rename from lib/cppcheckexecutor.h
rename to cli/cppcheckexecutor.h
diff --git a/cli/main.cpp b/cli/main.cpp
index 5fb29cd5f..e68972935 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -82,7 +82,7 @@ void CheckOther::checkZeroDivision()
  */
 
 
-#include "../lib/cppcheckexecutor.h"
+#include "cppcheckexecutor.h"
 
 /**
  * Main function of cppcheck
diff --git a/lib/threadexecutor.cpp b/cli/threadexecutor.cpp
similarity index 100%
rename from lib/threadexecutor.cpp
rename to cli/threadexecutor.cpp
diff --git a/lib/threadexecutor.h b/cli/threadexecutor.h
similarity index 100%
rename from lib/threadexecutor.h
rename to cli/threadexecutor.h
diff --git a/lib/lib.pri b/lib/lib.pri
index 22e37ce5d..4800be179 100644
--- a/lib/lib.pri
+++ b/lib/lib.pri
@@ -13,14 +13,12 @@ HEADERS += $$PWD/check.h \
            $$PWD/checkunusedfunctions.h \
            $$PWD/classinfo.h \
            $$PWD/cppcheck.h \
-           $$PWD/cppcheckexecutor.h \
            $$PWD/errorlogger.h \
            $$PWD/filelister.h \
            $$PWD/mathlib.h \
            $$PWD/preprocessor.h \
            $$PWD/resource.h \
            $$PWD/settings.h \
-           $$PWD/threadexecutor.h \
            $$PWD/token.h \
            $$PWD/tokenize.h
 
@@ -36,12 +34,10 @@ SOURCES += $$PWD/checkautovariables.cpp \
            $$PWD/checkstl.cpp \
            $$PWD/checkunusedfunctions.cpp \
            $$PWD/cppcheck.cpp \
-           $$PWD/cppcheckexecutor.cpp \
            $$PWD/errorlogger.cpp \
            $$PWD/filelister.cpp \
            $$PWD/mathlib.cpp \
            $$PWD/preprocessor.cpp \
            $$PWD/settings.cpp \
-           $$PWD/threadexecutor.cpp \
            $$PWD/token.cpp \
            $$PWD/tokenize.cpp