diff --git a/compilerplugins/clang/store/deletedspecial.cxx b/compilerplugins/clang/store/deletedspecial.cxx
index 7b23e2005b1d..6c2d58807a86 100644
--- a/compilerplugins/clang/store/deletedspecial.cxx
+++ b/compilerplugins/clang/store/deletedspecial.cxx
@@ -105,17 +105,21 @@ bool DeletedSpecial::VisitCXXMethodDecl(CXXMethodDecl const * decl) {
         } else if (ctor != nullptr && ctor->isDefaultConstructor()
                    && std::distance(cls->ctor_begin(), cls->ctor_end()) == 1)
         {
-            if (whitelist(decl, "DocTemplLocaleHelper", "sfx2/source/doc/doctemplateslocal.hxx")
+            if (whitelist(decl, "AquaA11yFocusListener", "vcl/osx/a11yfocuslistener.hxx")
+                || whitelist(decl, "DocTemplLocaleHelper", "sfx2/source/doc/doctemplateslocal.hxx")
                 || whitelist(decl, "ScViewDataTable", "sc/source/filter/excel/../../ui/inc/viewdata.hxx")
                 || whitelist(decl, "ScViewDataTable", "sc/source/ui/inc/viewdata.hxx")
                 || whitelist(decl, "SwLineInfo", "sw/source/core/text/inftxt.hxx")
                 || whitelist(decl, "XRenderPeer", "vcl/unx/generic/gdi/xrender_peer.hxx")
+                || whitelist(decl, "desktop::DispatchWatcher", "desktop/source/app/dispatchwatcher.hxx")
                 || whitelist(decl, "desktop::OfficeIPCThread", "desktop/source/app/officeipcthread.hxx")
                 || whitelist(decl, "desktop::OfficeIPCThread", "desktop/source/lib/../app/officeipcthread.hxx")
                 || whitelist(decl, "sd::DiscoveryService", "sd/source/ui/remotecontrol/DiscoveryService.hxx")
                 || whitelist(decl, "sd::IconCache", "sd/source/ui/inc/tools/IconCache.hxx")
+                || whitelist(decl, "sd::RemoteServer", "sd/source/ui/inc/RemoteServer.hxx")
                 || whitelist(decl, "sd::slidesorter::cache::PageCacheManager", "sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx")
                 || whitelist(decl, "sfx2::sidebar::CommandInfoProvider", "include/sfx2/sidebar/CommandInfoProvider.hxx")
+                || whitelist(decl, "vcl::SettingsConfigItem", "include/vcl/configsettings.hxx")
                 || whitelist(decl, "writerfilter::ooxml::OOXMLFactory", "writerfilter/source/ooxml/OOXMLFactory.hxx"))
             {
                 return true;
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index d0f2a542d23e..2f0d39d6f2d7 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -192,9 +192,8 @@ public:
    }
 
 private:
-    // prevent copy and assignment
-    SalAquaFilePicker( const SalAquaFilePicker& );
-    SalAquaFilePicker& operator=( const SalAquaFilePicker& );
+    SalAquaFilePicker( const SalAquaFilePicker& ) SAL_DELETED_FUNCTION;
+    SalAquaFilePicker& operator=( const SalAquaFilePicker& ) SAL_DELETED_FUNCTION;
 
     virtual void ensureFilterHelper();
 
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index 313acb79dc34..e8f95d740d43 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -101,9 +101,8 @@ public:
         throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
 private:
-    // prevent copy and assignment
-    SalAquaFolderPicker( const SalAquaFolderPicker& );
-    SalAquaFolderPicker& operator=( const SalAquaFolderPicker& );
+    SalAquaFolderPicker( const SalAquaFolderPicker& ) SAL_DELETED_FUNCTION;
+    SalAquaFolderPicker& operator=( const SalAquaFolderPicker& ) SAL_DELETED_FUNCTION;
 
     // to instantiate own services
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index a7b10426adb4..df566a8cdbd7 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -73,9 +73,8 @@ class MacSpellChecker :
     linguistic::PropertyHelper_Spell *      pPropHelper;
     bool                                    bDisposing;
 
-    // disallow copy-constructor and assignment-operator for now
-    MacSpellChecker(const MacSpellChecker &);
-    MacSpellChecker & operator = (const MacSpellChecker &);
+    MacSpellChecker(const MacSpellChecker &) SAL_DELETED_FUNCTION;
+    MacSpellChecker & operator = (const MacSpellChecker &) SAL_DELETED_FUNCTION;
 
     linguistic::PropertyHelper_Spell &  GetPropHelper_Impl();
     linguistic::PropertyHelper_Spell &  GetPropHelper()
diff --git a/vcl/inc/OpenGLWrapper.hxx b/vcl/inc/OpenGLWrapper.hxx
index 0b90b41ac4e2..9134801ea98a 100644
--- a/vcl/inc/OpenGLWrapper.hxx
+++ b/vcl/inc/OpenGLWrapper.hxx
@@ -10,19 +10,11 @@
 #include "AppKit/NSOpenGLView.h"
 #include "AppKit/NSOpenGL.h"
 
-class OpenGLWrapper
+namespace OpenGLWrapper
 {
-private:
-
-    OpenGLWrapper();
-    OpenGLWrapper(const OpenGLWrapper&);
-    OpenGLWrapper& operator=(const OpenGLWrapper&);
-
-public:
-
-    static void swapBuffers(NSOpenGLView* pView);
-    static void makeCurrent(NSOpenGLView* pView);
-    static void resetCurrent();
-};
+    void swapBuffers(NSOpenGLView* pView);
+    void makeCurrent(NSOpenGLView* pView);
+    void resetCurrent();
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 8bb0acf982c3..20c89c8ea93d 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -202,9 +202,8 @@ public:
  private: // data
     static AquaSalFrame*                   s_pCaptureFrame;
 
-    // make AquaSalFrame non copyable
-    AquaSalFrame( const AquaSalFrame& );
-    AquaSalFrame& operator=(const AquaSalFrame&);
+    AquaSalFrame( const AquaSalFrame& ) SAL_DELETED_FUNCTION;
+    AquaSalFrame& operator=(const AquaSalFrame&) SAL_DELETED_FUNCTION;
 };
 
 #endif // INCLUDED_VCL_INC_OSX_SALFRAME_H
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 7d35a99ac659..18f0bbafff67 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -109,8 +109,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter
     void setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation );
 
     private:
-    AquaSalInfoPrinter( const AquaSalInfoPrinter& );
-    AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&);
+    AquaSalInfoPrinter( const AquaSalInfoPrinter& ) SAL_DELETED_FUNCTION;
+    AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&) SAL_DELETED_FUNCTION;
 };
 
 // - AquaSalPrinter -
@@ -143,8 +143,8 @@ class AquaSalPrinter : public SalPrinter
     virtual sal_uLong               GetErrorCode() SAL_OVERRIDE;
 
     private:
-    AquaSalPrinter( const AquaSalPrinter& );
-    AquaSalPrinter& operator=(const AquaSalPrinter&);
+    AquaSalPrinter( const AquaSalPrinter& ) SAL_DELETED_FUNCTION;
+    AquaSalPrinter& operator=(const AquaSalPrinter&) SAL_DELETED_FUNCTION;
 };
 
 const double fPtTo100thMM = 35.27777778;