diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc4a4a21b..93d5262d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,7 @@ if(LIBGIT2_FROM_PKGCONFIG)
 	set(LIBGIT2_LIBRARIES "")
 	if(USE_LIBGIT23_API)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_LIBGIT23_API")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LIBGIT23_API")
 		pkg_config_library(LIBSSH2 libssh2 REQUIRED)
 		set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES})
 	endif()
@@ -52,6 +53,7 @@ else()
 	include_directories(${LIBGIT2_INCLUDE_DIR})
 	if(USE_LIBGIT23_API)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_LIBGIT23_API")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LIBGIT23_API")
 		set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} -lssh2)
 	endif()
 endif()
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index b039af9bb..8630cfbb8 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -148,6 +148,11 @@ MainWindow::MainWindow() : QMainWindow(),
 	plannerDetails->printPlan()->hide();
 	ui.menuFile->removeAction(ui.actionPrint);
 #endif
+#ifndef USE_LIBGIT23_API
+	ui.menuFile->removeAction(ui.actionCloudstorageopen);
+	ui.menuFile->removeAction(ui.actionCloudstoragesave);
+	qDebug() << "disabled / made invisible the cloud storage stuff";
+#endif
 
 	ui.mainErrorMessage->hide();
 	graphics()->setEmptyState();