diff --git a/src/gui/dialogs/render.cpp b/src/gui/dialogs/render.cpp
index 91bdbaf67..7e4b40378 100644
--- a/src/gui/dialogs/render.cpp
+++ b/src/gui/dialogs/render.cpp
@@ -24,6 +24,7 @@
 
 #include "render.hpp"
 #include "dialog.hpp"
+#include "common/logging.h"
 
 using namespace Gtk;
 
diff --git a/src/gui/gtk-lumiera.hpp b/src/gui/gtk-lumiera.hpp
index 956223de9..9536f348b 100644
--- a/src/gui/gtk-lumiera.hpp
+++ b/src/gui/gtk-lumiera.hpp
@@ -43,7 +43,7 @@ extern "C" {
 #include <gavl/gavltime.h>
 }
 
-NOBUG_DECLARE_FLAG(gui);
+//NOBUG_DECLARE_FLAG(gui);
 
 #ifdef ENABLE_NLS
 #  include <libintl.h>
diff --git a/src/gui/guistart.cpp b/src/gui/guistart.cpp
index e0e3b2930..fe26d92d5 100644
--- a/src/gui/guistart.cpp
+++ b/src/gui/guistart.cpp
@@ -48,7 +48,7 @@
 #include <locale>               // need to include this to prevent errors when libintl.h defines textdomain (because gtk-lumiera removes the def when ENABLE_NLS isn't defined)
 
 #include "gui/gtk-lumiera.hpp"  // need to include this before nobugcfg.h, because types.h from GTK tries to shaddow the ERROR macro from windows, which kills nobug's ERROR macro
-#include "include/nobugcfg.h"
+// TODO not needed? #include "common/logging.h"
 #include "lib/error.hpp"
 #include "gui/guifacade.hpp"
 #include "gui/notification-service.hpp"
diff --git a/src/gui/model/sequence.cpp b/src/gui/model/sequence.cpp
index e6f90207a..a6bab6178 100644
--- a/src/gui/model/sequence.cpp
+++ b/src/gui/model/sequence.cpp
@@ -21,6 +21,7 @@
 * *****************************************************/
 
 #include "sequence.hpp"
+#include "common/logging.h"
 
 // TEST CODE
 #include "group-track.hpp"
diff --git a/src/gui/notification-service.cpp b/src/gui/notification-service.cpp
index f713d7390..ebca1bc7c 100644
--- a/src/gui/notification-service.cpp
+++ b/src/gui/notification-service.cpp
@@ -23,7 +23,7 @@
 
 #include "gui/notification-service.hpp"
 #include "lib/singleton.hpp"
-#include "include/nobugcfg.h"
+#include "common/logging.h"
 #include "lib/util.hpp"
 
 extern "C" {
@@ -44,7 +44,7 @@ namespace gui {
   void 
   NotificationService::displayInfo (string const& text)
   {
-    INFO (operate, "@GUI: display '%s' as notification message.", cStr(text));
+    INFO (gui, "@GUI: display '%s' as notification message.", cStr(text));
     ////////////////////////TODO actually push the information to the GUI
   }
   
@@ -52,7 +52,7 @@ namespace gui {
   void
   NotificationService::triggerGuiShutdown (string const& cause)
   {
-    NOTICE (operate, "@GUI: shutdown triggered with explanation '%s'....", cStr(cause));
+    NOTICE (gui, "@GUI: shutdown triggered with explanation '%s'....", cStr(cause));
     TODO ("actually request a shutdown from the GUI");
   }
   
@@ -173,7 +173,7 @@ namespace gui {
     : implInstance_(this,_instance),
       serviceInstance_( LUMIERA_INTERFACE_REF (lumieraorg_GuiNotification, 1,lumieraorg_GuiNotificationFacade))
   {
-    INFO (operate, "GuiNotification Facade opened.");
+    INFO (gui, "GuiNotification Facade opened.");
   }
   
   
diff --git a/src/gui/output/xvdisplayer.cpp b/src/gui/output/xvdisplayer.cpp
index ade6973e5..82f6c9115 100644
--- a/src/gui/output/xvdisplayer.cpp
+++ b/src/gui/output/xvdisplayer.cpp
@@ -27,6 +27,7 @@
 #include <gdk/gdkx.h>
 
 #include "xvdisplayer.hpp"
+#include "common/logging.h"
 
 namespace gui {
 namespace output {
@@ -126,13 +127,13 @@ XvDisplayer::XvDisplayer( Gtk::Widget *drawing_area, int width, int height ) :
                     {
                       Atom val_atom = XInternAtom( display, xvattr[k].name, False );
                       if ( XvSetPortAttribute( display, grabbedPort, val_atom, 1 ) != Success )
-                        ERROR(gui, "Couldn't set Xv attribute %s\n", xvattr[k].name);
+                        NOBUG_ERROR(gui, "Couldn't set Xv attribute %s\n", xvattr[k].name);
                     }
                   else if (  strcmp( xvattr[k].name, "XV_COLORKEY") == 0 )
                     {
                       Atom val_atom = XInternAtom( display, xvattr[k].name, False );
                       if ( XvSetPortAttribute( display, grabbedPort, val_atom, 0x010102 ) != Success )
-                        ERROR(gui, "Couldn't set Xv attribute %s\n", xvattr[k].name);
+                        NOBUG_ERROR(gui, "Couldn't set Xv attribute %s\n", xvattr[k].name);
                     }
                 }
             }
@@ -173,7 +174,7 @@ XvDisplayer::XvDisplayer( Gtk::Widget *drawing_area, int width, int height ) :
 
 XvDisplayer::~XvDisplayer()
 {
-  ERROR(gui, "Destroying XV Displayer");
+  NOBUG_ERROR(gui, "Destroying XV Displayer");
 
   if ( gotPort )
     {
diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp
index e755ddaad..bd3a3451f 100644
--- a/src/gui/widgets/timeline/timeline-body.cpp
+++ b/src/gui/widgets/timeline/timeline-body.cpp
@@ -29,6 +29,7 @@
 
 #include "timeline-arrow-tool.hpp"
 #include "timeline-ibeam-tool.hpp"
+#include "common/logging.h"
 
 using namespace Gtk;
 using namespace std;
diff --git a/src/gui/widgets/timeline/timeline-track.cpp b/src/gui/widgets/timeline/timeline-track.cpp
index 717a106dd..5222e64c6 100644
--- a/src/gui/widgets/timeline/timeline-track.cpp
+++ b/src/gui/widgets/timeline/timeline-track.cpp
@@ -27,6 +27,7 @@
 #include "../timeline-widget.hpp"
 #include "../../window-manager.hpp"
 #include "../../dialogs/name-chooser.hpp"
+#include "common/logging.h"
 
 using namespace boost;
 using namespace Gtk;
@@ -209,7 +210,8 @@ Track::get_expander_style() const
         return EXPANDER_SEMI_COLLAPSED;
     }
     
-  ERROR(gui, "Track::get_expander_style() final return reached");  
+  NOBUG_ERROR(gui, "Track::get_expander_style() final return reached");
+
   return EXPANDER_COLLAPSED;   // This should never happen
 }
 
diff --git a/src/gui/window-manager.cpp b/src/gui/window-manager.cpp
index 88de4db56..c25992695 100644
--- a/src/gui/window-manager.cpp
+++ b/src/gui/window-manager.cpp
@@ -21,6 +21,7 @@
 * *****************************************************/
 
 #include "window-manager.hpp"
+#include "common/logging.h"
 
 using namespace Gtk;
 using namespace Glib;
@@ -41,7 +42,8 @@ WindowManager::set_theme(Glib::ustring path)
 {
   if(access(path.c_str(), R_OK))
     {
-      ERROR(gui, "WindowManger: Unable to load rc file \"%s\"",
+      // gdk defines 'ERROR' need to prefix it with 'NOBUG_' here
+      NOBUG_ERROR(gui, "WindowManger: Unable to load rc file \"%s\"",
         path.c_str());
       return false;        
     }
diff --git a/src/gui/workspace/workspace-window.cpp b/src/gui/workspace/workspace-window.cpp
index abcce5601..f41033421 100644
--- a/src/gui/workspace/workspace-window.cpp
+++ b/src/gui/workspace/workspace-window.cpp
@@ -34,6 +34,7 @@
 
 #include "../gtk-lumiera.hpp"
 #include "workspace-window.hpp"
+#include "common/logging.h"
 
 using namespace Gtk;
 using namespace gui::model;
@@ -142,7 +143,7 @@ WorkspaceWindow::create_ui()
     }
   catch(const Glib::Error& ex)
     {
-      ERROR(gui, "Building menus failed: %s", ex.what().data());
+      NOBUG_ERROR(gui, "Building menus failed: %s", ex.what().data());
       return;
     }