diff --git a/application/F3DConfig.h.in b/application/F3DConfig.h.in
index 5d9202c522..0a37efcc2f 100644
--- a/application/F3DConfig.h.in
+++ b/application/F3DConfig.h.in
@@ -10,6 +10,7 @@ namespace F3D
   const std::string PluginsInstallDir = "@F3D_PLUGINS_INSTALL_DIR@";
 }
 
+// TODO: Use CMake definitions and get rid of these
 #cmakedefine01 F3D_MACOS_BUNDLE
 #cmakedefine01 F3D_MODULE_RAYTRACING
 #cmakedefine01 F3D_MODULE_EXR
diff --git a/library/VTKExtensions/Core/vtkF3DConfigure.h.in b/library/VTKExtensions/Core/vtkF3DConfigure.h.in
index fb158de8a4..cb221b6557 100644
--- a/library/VTKExtensions/Core/vtkF3DConfigure.h.in
+++ b/library/VTKExtensions/Core/vtkF3DConfigure.h.in
@@ -6,6 +6,7 @@
 static const std::string F3D_RESERVED_STRING = "f3d_reserved";
 static const std::string F3D_EXIT_HOTKEY_SYM = "Escape";
 
+// TODO: Use CMake definitions and get rid of these
 #cmakedefine01 F3D_WINDOWS_GUI
 
 #cmakedefine01 F3D_MODULE_EXTERNAL_RENDERING
diff --git a/library/public/image.h b/library/public/image.h
index 28e12a6348..328d0cbc7c 100644
--- a/library/public/image.h
+++ b/library/public/image.h
@@ -123,6 +123,8 @@ class F3D_EXPORT image
   /**
    * Set/Get image buffer data.
    * Its size is expected to be `width * height * channelCount * typeSize`.
+   * 
+   * \deprecated { setData and getData are deprecated, use setContent and getContent instead }
    */
   image& setContent(void* buffer);
   void* getContent() const;
diff --git a/library/testing/TestSDKExternalWindowQT.cxx b/library/testing/TestSDKExternalWindowQT.cxx
index 2b30bdc1e0..ac4d6d5a99 100644
--- a/library/testing/TestSDKExternalWindowQT.cxx
+++ b/library/testing/TestSDKExternalWindowQT.cxx
@@ -38,7 +38,7 @@ class F3DWindow : public QOpenGLWindow
     QImage frameBuffer = grabFramebuffer().mirrored().convertToFormat(QImage::Format_RGB888);
 
     f3d::image img(frameBuffer.width(), frameBuffer.height(), 3);
-    img.setData(frameBuffer.bits());
+    img.setContent(frameBuffer.bits());
 
     if (!TestSDKHelpers::RenderTest(
           img, this->mBaselinePath, this->mOutputPath, "TestSDKExternalWindowQT"))
diff --git a/python/F3DPythonBindings.cxx b/python/F3DPythonBindings.cxx
index 8317431f54..21aa909c4d 100644
--- a/python/F3DPythonBindings.cxx
+++ b/python/F3DPythonBindings.cxx
@@ -258,8 +258,10 @@ PYBIND11_MODULE(f3d, module)
     .def_static("getReadersInfo", &f3d::engine::getReadersInfo)
     .def_static("getPluginsList", &f3d::engine::getPluginsList);
 
-// deprecated functions, will be removed in the next major release
+// deprecated functions, will be removed in the next major release, F3D v3.0.0
 #ifndef F3D_NO_DEPRECATED
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   image.def("setResolution",
     [](f3d::image& img, unsigned int width, unsigned height)
     {
@@ -288,5 +290,6 @@ PYBIND11_MODULE(f3d, module)
       PyErr_WarnEx(PyExc_DeprecationWarning, "getData is deprecated, use getContent instead.", 1);
       getImageBytes(img);
     });
+#pragma GCC diagnostic pop
 #endif
 }