Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp	(revision 30287)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp	(revision 30288)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -18,7 +18,6 @@
  */
 
+/* Local includes */
 #include <VBoxDefs.h>
-
-const QUuid QUuid_null;
 
 const char* VBoxDefs::GUI_LastWindowPosition = "GUI/LastWindowPostion";
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h	(revision 30287)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h	(revision 30288)
@@ -46,19 +46,4 @@
 #define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0]))
 #endif
-
-#if defined (VBOX_GUI_USE_QIMAGE) || \
-    defined (VBOX_GUI_USE_SDL) || \
-    defined (VBOX_GUI_USE_DDRAW)
-  #if !defined (VBOX_GUI_USE_EXT_FRAMEBUFFER)
-    #define VBOX_GUI_USE_EXT_FRAMEBUFFER
-  #endif
-#else
-  #if defined (VBOX_GUI_USE_EXT_FRAMEBUFFER)
-    #undef VBOX_GUI_USE_EXT_FRAMEBUFFER
-  #endif
-#endif
-
-/** Null UUID constant to be used as a default value for reference parameters */
-extern const QUuid QUuid_null;
 
 /** Common namespace for all enums */
@@ -197,4 +182,4 @@
 #define MAC_LEOPARD_STYLE defined(Q_WS_MAC) && (QT_VERSION >= 0x040300)
 
-#endif // __VBoxDefs_h__
+#endif /* __VBoxDefs_h__ */