diff --git a/.selfcheck_suppressions b/.selfcheck_suppressions
index 5ee35b35068..b6b43bdcb2a 100644
--- a/.selfcheck_suppressions
+++ b/.selfcheck_suppressions
@@ -2,24 +2,6 @@ missingIncludeSystem
 # should not be reported - see #13387
 checkersReport
 
-# temporary suppressions - fix the warnings!
-simplifyUsing:lib/valueptr.h
-naming-privateMemberVariable:gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
-bitwiseOnBoolean:lib/library.cpp
-templateInstantiation:lib/checkunusedfunctions.cpp
-templateInstantiation:lib/errorlogger.cpp
-templateInstantiation:lib/liobrary.cpp
-shadowFunction:lib/checkbufferoverrun.cpp
-shadowFunction:lib/checkclass.cpp
-shadowFunction:lib/checknullpointer.cpp
-shadowFunction:lib/cppcheck.cpp
-shadowFunction:lib/fwdanalysis.cpp
-shadowFunction:lib/library.cpp
-shadowFunction:lib/symboldatabase.cpp
-shadowFunction:lib/templatesimplifier.cpp
-shadowFunction:lib/token.cpp
-shadowFunction:tools/triage/mainwindow.cpp
-
 # warnings in Qt generated code we cannot fix
 funcArgNamesDifferent:*/moc_checkthread.cpp
 funcArgNamesDifferent:*/moc_codeeditstylecontrols.cpp
diff --git a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
index 15f79b67c7e..625ad4046a9 100644
--- a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
+++ b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
@@ -48,9 +48,13 @@ private slots:
     static void loadCfgFile(const QString &filename, CppcheckLibraryData &data, QString &res, bool removeFile = false);
     static void saveCfgFile(const QString &filename, CppcheckLibraryData &data);
 
+    // cppcheck-suppress naming-privateMemberVariable - TODO: fix this
     CppcheckLibraryData libraryData;
+    // cppcheck-suppress naming-privateMemberVariable - TODO: fix this
     CppcheckLibraryData fileLibraryData;
+    // cppcheck-suppress naming-privateMemberVariable - TODO: fix this
     QString result;
 
+    // cppcheck-suppress naming-privateMemberVariable - TODO: fix this
     static const QString TempCfgFile;
 };
diff --git a/lib/valueptr.h b/lib/valueptr.h
index 5c2ce55bedf..de364d759f5 100644
--- a/lib/valueptr.h
+++ b/lib/valueptr.h
@@ -37,6 +37,7 @@ class CPPCHECKLIB ValuePtr {
 public:
     using pointer = T*;
     using element_type = T;
+    // cppcheck-suppress simplifyUsing - TODO: fix this
     using cloner_type = decltype(&cloner<T>::apply);
 
     ValuePtr() : mPtr(nullptr), mClone() {}