xwin: consolidate debugging symbols

We've got three #define's that are all set at once, on enable_debugging.

A comment in meson.build already asks for consolidating them into one,
so just do it now.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1409>

23 files changed, 160 insertions, 171 deletions

diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index 04cd514ab..1b7068dba 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -88,7 +88,7 @@ xwinDevWindowsHandlerNotify(int fd, int ready, void *data)
 void
 InitInput(int argc, char *argv[])
 {
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("InitInput\n");
 #endif
 
@@ -126,7 +126,7 @@ InitInput(int argc, char *argv[])
     }
 #endif
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("InitInput - returning\n");
 #endif
 }
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 9db2a28fa..ddaa31964 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -193,7 +193,7 @@ ddxGiveUp(enum ExitCode error)
 {
     int i;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("ddxGiveUp\n");
 #endif
 
@@ -906,7 +906,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
     /* Log the command line */
     winLogCommandLine(argc, argv);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("InitOutput\n");
 #endif
 
@@ -1024,7 +1024,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
         winGenerateAuthorization();
 
 
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
     winDebug("InitOutput - Returning.\n");
 #endif
 }
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 61e36384c..1c4af37e1 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -48,8 +48,8 @@
 #endif
 
 /* Turn debug messages on or off */
-#ifndef CYGDEBUG
-#define CYGDEBUG				NO
+#ifndef ENABLE_DEBUG
+#define ENABLE_DEBUG				NO
 #endif
 
 #define WIN_DEFAULT_BPP				0
@@ -193,7 +193,7 @@
  * Debugging macros
  */
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
 #define DEBUG_MSG(str,...) \
 if (fDebugProcMsg) \
 { \
@@ -208,19 +208,19 @@ if (fDebugProcMsg) \
 #define DEBUG_MSG(str,...)
 #endif
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
 #define DEBUG_FN_NAME(str) PTSTR szFunctionName = str
 #else
 #define DEBUG_FN_NAME(str)
 #endif
 
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
 #define DEBUGVARS BOOL fDebugProcMsg = FALSE
 #else
 #define DEBUGVARS
 #endif
 
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
 #define DEBUGPROC_MSG fDebugProcMsg = TRUE
 #else
 #define DEBUGPROC_MSG
diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c
index f8f7a8ec7..1212cbba9 100644
--- a/hw/xwin/winallpriv.c
+++ b/hw/xwin/winallpriv.c
@@ -47,7 +47,7 @@ winAllocatePrivates(ScreenPtr pScreen)
 {
     winPrivScreenPtr pScreenPriv;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winAllocateScreenPrivates - g_ulServerGeneration: %lu "
              "serverGeneration: %lu\n", g_ulServerGeneration, serverGeneration);
 #endif
@@ -102,7 +102,7 @@ winAllocatePrivates(ScreenPtr pScreen)
 Bool
 winInitCmapPrivates(ColormapPtr pcmap, int i)
 {
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winInitCmapPrivates\n");
 #endif
 
@@ -129,7 +129,7 @@ winAllocateCmapPrivates(ColormapPtr pCmap)
     winPrivCmapPtr pCmapPriv;
     static unsigned long s_ulPrivateGeneration = 0;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winAllocateCmapPrivates\n");
 #endif
 
@@ -155,7 +155,7 @@ winAllocateCmapPrivates(ColormapPtr pCmap)
     /* Save the cmap private pointer */
     winSetCmapPriv(pCmap, pCmapPriv);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winAllocateCmapPrivates - Returning\n");
 #endif
 
diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c
index 000334ce3..0df14c0f5 100644
--- a/hw/xwin/wincmap.c
+++ b/hw/xwin/wincmap.c
@@ -116,13 +116,13 @@ winInstallColormap(ColormapPtr pColormap)
     winScreenPriv(pScreen);
     ColormapPtr oldpmap = pScreenPriv->pcmapInstalled;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winInstallColormap\n");
 #endif
 
     /* Did the colormap actually change? */
     if (pColormap != oldpmap) {
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winInstallColormap - Colormap has changed, attempt "
                  "to install.\n");
 #endif
@@ -157,7 +157,7 @@ winUninstallColormap(ColormapPtr pmap)
     winScreenPriv(pmap->pScreen);
     ColormapPtr curpmap = pScreenPriv->pcmapInstalled;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winUninstallColormap\n");
 #endif
 
@@ -194,7 +194,7 @@ winStoreColors(ColormapPtr pmap, int ndef, xColorItem * pdefs)
     int i;
     unsigned short nRed, nGreen, nBlue;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     if (ndef != 1)
         winDebug("winStoreColors - ndef: %d\n", ndef);
 #endif
@@ -216,7 +216,7 @@ winStoreColors(ColormapPtr pmap, int ndef, xColorItem * pdefs)
         pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbGreen = nGreen;
         pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbBlue = nBlue;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winStoreColors - nRed %d nGreen %d nBlue %d\n",
                  nRed, nGreen, nBlue);
 #endif
@@ -237,7 +237,7 @@ winResolveColor(unsigned short *pred,
                 unsigned short *pgreen,
                 unsigned short *pblue, VisualPtr pVisual)
 {
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winResolveColor ()\n");
 #endif
 
@@ -253,7 +253,7 @@ winCreateColormap(ColormapPtr pmap)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winCreateColormap\n");
 #endif
 
@@ -311,7 +311,7 @@ winDestroyColormap(ColormapPtr pColormap)
     free(pCmapPriv);
     winSetCmapPriv(pColormap, NULL);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winDestroyColormap - Returning\n");
 #endif
 }
@@ -338,7 +338,7 @@ winGetPaletteDIB(ScreenPtr pScreen, ColormapPtr pcmap)
         return FALSE;
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winGetPaletteDIB - Retrieved %d colors from DIB\n",
              uiColorsRetrieved);
 #endif
@@ -359,7 +359,7 @@ winGetPaletteDIB(ScreenPtr pScreen, ColormapPtr pcmap)
         nGreen = rgbColors[i].rgbGreen << 8;
         nBlue = rgbColors[i].rgbBlue << 8;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winGetPaletteDIB - Allocating a color: %u; "
                  "%d %d %d\n", (unsigned int)pixel, nRed, nGreen, nBlue);
 #endif
@@ -421,7 +421,7 @@ winGetPaletteDD(ScreenPtr pScreen, ColormapPtr pcmap)
         return FALSE;
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winGetPaletteDD - uiSystemPaletteEntries %d\n",
              uiSystemPaletteEntries);
 #endif
@@ -444,7 +444,7 @@ winGetPaletteDD(ScreenPtr pScreen, ColormapPtr pcmap)
         nRed = ppeColors[i].peRed << 8;
         nGreen = ppeColors[i].peGreen << 8;
         nBlue = ppeColors[i].peBlue << 8;
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winGetPaletteDD - Allocating a color: %u; "
                  "%d %d %d\n", (unsigned int)pixel, nRed, nGreen, nBlue);
 #endif
@@ -493,7 +493,7 @@ winCreateDefColormap(ScreenPtr pScreen)
     ColormapPtr pcmap = NULL;
     Pixel wp, bp;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winCreateDefColormap\n");
 #endif
 
@@ -514,7 +514,7 @@ winCreateDefColormap(ScreenPtr pScreen)
      * to be changed by clients.
      */
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winCreateDefColormap - defColormap: %lu\n", pScreen->defColormap);
 #endif
 
@@ -533,7 +533,7 @@ winCreateDefColormap(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winCreateDefColormap - Created a colormap\n");
 #endif
 
@@ -594,7 +594,7 @@ winCreateDefColormap(ScreenPtr pScreen)
     /* Install the created colormap */
     (*pScreen->InstallColormap) (pcmap);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winCreateDefColormap - Returning\n");
 #endif
 
diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c
index d57d66a19..e3238ae76 100644
--- a/hw/xwin/wincreatewnd.c
+++ b/hw/xwin/wincreatewnd.c
@@ -61,7 +61,7 @@ winCreateBoundingWindowFullScreen(ScreenPtr pScreen)
     WNDCLASSEX wc;
     char szTitle[256];
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winCreateBoundingWindowFullScreen\n");
 #endif
 
@@ -210,7 +210,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
     /* Did the user specify a height and width? */
     if (pScreenInfo->fUserGaveHeightAndWidth) {
         /* User gave a desired height and width, try to accommodate */
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winCreateBoundingWindowWindowed - User gave height "
                  "and width\n");
 #endif
@@ -220,14 +220,14 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
             && !pScreenInfo->fRootless
             && !pScreenInfo->fMultiWindow
             ) {
-#if CYGDEBUG
+#if ENABLE_DEBUG
             winDebug
                 ("winCreateBoundingWindowWindowed - Window has decoration\n");
 #endif
 
             /* Are we resizable */
             if (pScreenInfo->iResizeMode != resizeNotAllowed) {
-#if CYGDEBUG
+#if ENABLE_DEBUG
                 winDebug
                     ("winCreateBoundingWindowWindowed - Window is resizable\n");
 #endif
@@ -237,7 +237,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
                     + GetSystemMetrics(SM_CYCAPTION);
             }
             else {
-#if CYGDEBUG
+#if ENABLE_DEBUG
                 winDebug
                     ("winCreateBoundingWindowWindowed - Window is not resizable\n");
 #endif
@@ -250,7 +250,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
     }
     else {
         /* By default, we are creating a window that is as large as possible */
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winCreateBoundingWindowWindowed - User did not give "
                  "height and width\n");
 #endif
@@ -273,7 +273,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
         if (iHeight >= (rcWorkArea.bottom - rcWorkArea.top))
             iHeight = rcWorkArea.bottom - rcWorkArea.top;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winCreateBoundingWindowWindowed - Adjusted width: %d "
                  "height: %d\n", iWidth, iHeight);
 #endif
@@ -307,7 +307,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winCreateBoundingWindowWindowed - CreateWindowEx () returned\n");
 #endif
 
diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c
index 26b2ebd2c..91222f5a2 100644
--- a/hw/xwin/windialogs.c
+++ b/hw/xwin/windialogs.c
@@ -413,14 +413,14 @@ winChangeDepthDlgProc(HWND hwndDialog, UINT message,
     static winPrivScreenPtr s_pScreenPriv = NULL;
     static winScreenInfo *s_pScreenInfo = NULL;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winChangeDepthDlgProc\n");
 #endif
 
     /* Branch on message type */
     switch (message) {
     case WM_INITDIALOG:
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winChangeDepthDlgProc - WM_INITDIALOG\n");
 #endif
 
@@ -428,13 +428,13 @@ winChangeDepthDlgProc(HWND hwndDialog, UINT message,
         s_pScreenPriv = (winPrivScreenPtr) lParam;
         s_pScreenInfo = s_pScreenPriv->pScreenInfo;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %p, "
                  "s_pScreenInfo: %p\n",
                  s_pScreenPriv, s_pScreenInfo);
 #endif
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winChangeDepthDlgProc - WM_INITDIALOG - orig bpp: %u, "
                  "current bpp: %d\n",
                  (unsigned int)s_pScreenInfo->dwBPP,
@@ -446,7 +446,7 @@ winChangeDepthDlgProc(HWND hwndDialog, UINT message,
         return TRUE;
 
     case WM_DISPLAYCHANGE:
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winChangeDepthDlgProc - WM_DISPLAYCHANGE - orig bpp: %u, "
                  "new bpp: %d\n",
                  (unsigned int)s_pScreenInfo->dwBPP,
@@ -542,14 +542,14 @@ winAboutDlgProc(HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam)
 {
     static winPrivScreenPtr s_pScreenPriv = NULL;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winAboutDlgProc\n");
 #endif
 
     /* Branch on message type */
     switch (message) {
     case WM_INITDIALOG:
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winAboutDlgProc - WM_INITDIALOG\n");
 #endif
 
diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c
index aad99d9ad..52166a850 100644
--- a/hw/xwin/winmouse.c
+++ b/hw/xwin/winmouse.c
@@ -231,7 +231,7 @@ winMouseButtonsSendEvent(int iEventType, int iButton)
     QueuePointerEvents(g_pwinPointer, iEventType, iButton,
                        POINTER_RELATIVE, &mask);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n",
            iEventType, iButton);
 #endif
diff --git a/hw/xwin/winmsg.c b/hw/xwin/winmsg.c
index 2ee48ce5a..8629875c3 100644
--- a/hw/xwin/winmsg.c
+++ b/hw/xwin/winmsg.c
@@ -33,7 +33,7 @@
 #endif
 #include "win.h"
 #include "winmsg.h"
-#if CYGDEBUG
+#if ENABLE_DEBUG
 #include "winmessages.h"
 #endif
 #include <stdarg.h>
@@ -117,7 +117,7 @@ winW32ErrorEx(int verb, const char *msg, DWORD errorcode)
     }
 }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
 void
 winDebugWin32Message(const char *function, HWND hwnd, UINT message,
                      WPARAM wParam, LPARAM lParam)
diff --git a/hw/xwin/winmsgwindow.c b/hw/xwin/winmsgwindow.c
index f5649b722..8792d779c 100644
--- a/hw/xwin/winmsgwindow.c
+++ b/hw/xwin/winmsgwindow.c
@@ -41,7 +41,7 @@ static
 LRESULT CALLBACK
 winMsgWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebugWin32Message("winMsgWindowProc", hwnd, message, wParam, lParam);
 #endif
 
@@ -153,7 +153,7 @@ winMsgWindowThreadProc(void *arg)
 
         /* Pump the msg window message queue */
         while (GetMessage(&msg, hwndMsg, 0, 0) > 0) {
-#if CYGDEBUG
+#if ENABLE_DEBUG
             winDebugWin32Message("winMsgWindowThread", msg.hwnd, msg.message,
                                  msg.wParam, msg.lParam);
 #endif
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index 73afaea55..dba3202d2 100644
--- a/hw/xwin/winmultiwindowshape.c
+++ b/hw/xwin/winmultiwindowshape.c
@@ -46,7 +46,7 @@ winSetShapeMultiWindow(WindowPtr pWin, int kind)
 
     winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("winSetShapeMultiWindow - pWin: %p kind: %i\n", pWin, kind);
 #endif
 
@@ -89,7 +89,7 @@ winReshapeMultiWindow(WindowPtr pWin)
 
     winWindowPriv(pWin);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winReshape ()\n");
 #endif
 
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 5b9b74e3d..030546527 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -84,7 +84,7 @@ winInitMultiWindowClass(void)
         wcx.lpszClassName = WINDOW_CLASS_X;
         wcx.hIconSm = hIconSmall;
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
         ErrorF("winCreateWindowsWindow - Creating class: %s\n", WINDOW_CLASS_X);
 #endif
 
@@ -105,7 +105,7 @@ winCreateWindowMultiWindow(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     winTrace("winCreateWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
@@ -138,7 +138,7 @@ winDestroyWindowMultiWindow(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("winDestroyWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
@@ -177,14 +177,14 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
     RECT rcNew;
     RECT rcOld;
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     RECT rcClient;
     RECT *lpRc;
 #endif
     DWORD dwExStyle;
     DWORD dwStyle;
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     winTrace("winPositionWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
@@ -192,13 +192,13 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
     fResult = (*pScreen->PositionWindow) (pWin, x, y);
     WIN_WRAP(PositionWindow, winPositionWindowMultiWindow);
 
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
     ErrorF("winPositionWindowMultiWindow: (x, y) = (%d, %d)\n", x, y);
 #endif
 
     /* Bail out if the Windows window handle is bad */
     if (!hWnd) {
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
         ErrorF("\timmediately return since hWnd is NULL\n");
 #endif
         return fResult;
@@ -219,7 +219,7 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
     /* Store the origin, height, and width in a rectangle structure */
     SetRect(&rcNew, iX, iY, iX + iWidth, iY + iHeight);
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     lpRc = &rcNew;
     ErrorF("winPositionWindowMultiWindow - drawable (%d, %d)-(%d, %d)\n",
            (int)lpRc->left, (int)lpRc->top, (int)lpRc->right, (int)lpRc->bottom);
@@ -234,7 +234,7 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
     /* Get a rectangle describing the old Windows window */
     GetWindowRect(hWnd, &rcOld);
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     /* Get a rectangle describing the Windows window client area */
     GetClientRect(hWnd, &rcClient);
 
@@ -253,11 +253,11 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
 
     /* Check if the old rectangle and new rectangle are the same */
     if (!EqualRect(&rcNew, &rcOld)) {
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
         ErrorF("winPositionWindowMultiWindow - Need to move\n");
 #endif
 
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
         ErrorF("\tMoveWindow to (%d, %d) - %dx%d\n", (int)rcNew.left, (int)rcNew.top,
                (int)(rcNew.right - rcNew.left), (int)(rcNew.bottom - rcNew.top));
 #endif
@@ -267,7 +267,7 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
                    rcNew.right - rcNew.left, rcNew.bottom - rcNew.top, TRUE);
     }
     else {
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
         ErrorF("winPositionWindowMultiWindow - Not need to move\n");
 #endif
     }
@@ -287,7 +287,7 @@ winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask)
 
     winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("winChangeWindowAttributesMultiWindow - pWin: %p\n", pWin);
 #endif
 
@@ -316,7 +316,7 @@ winUnmapWindowMultiWindow(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("winUnmapWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
@@ -347,7 +347,7 @@ winMapWindowMultiWindow(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("winMapWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
@@ -411,7 +411,7 @@ winRestackWindowMultiWindow(WindowPtr pWin, WindowPtr pOldNextSib)
 
     winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG || ENABLE_DEBUG
     winTrace("winRestackMultiWindow - %p\n", pWin);
 #endif
 
@@ -676,7 +676,7 @@ winUpdateWindowsWindow(WindowPtr pWin)
     winWindowPriv(pWin);
     HWND hWnd = pWinPriv->hWnd;
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("winUpdateWindowsWindow\n");
 #endif
 
@@ -701,7 +701,7 @@ winUpdateWindowsWindow(WindowPtr pWin)
         assert(pWinPriv->hWnd == NULL);
     }
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("-winUpdateWindowsWindow\n");
 #endif
 }
@@ -719,7 +719,7 @@ winGetWindowID(WindowPtr pWin)
     /* */
     FindClientResourcesByType(c, RT_WINDOW, winFindWindow, &wi);
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("winGetWindowID - Window ID: %u\n", (unsigned int)wi.id);
 #endif
 
@@ -755,13 +755,13 @@ winReorderWindowsMultiWindow(void)
     DWORD dwCurrentProcessID = GetCurrentProcessId();
     DWORD dwWindowProcessID = 0;
 
-#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG || ENABLE_DEBUG
     winTrace("winReorderWindowsMultiWindow\n");
 #endif
 
     if (fRestacking) {
         /* It is a recursive call so immediately exit */
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
         ErrorF("winReorderWindowsMultiWindow - "
                "exit because fRestacking == TRUE\n");
 #endif
@@ -809,7 +809,7 @@ winCopyWindowMultiWindow(WindowPtr pWin, DDXPointRec oldpt, RegionPtr oldRegion)
 
     winScreenPriv(pScreen);
 
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
     ErrorF("CopyWindowMultiWindow\n");
 #endif
     WIN_UNWRAP(CopyWindow);
@@ -828,7 +828,7 @@ winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
 
     winScreenPriv(pScreen);
 
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
     ErrorF("MoveWindowMultiWindow to (%d, %d)\n", x, y);
 #endif
 
@@ -848,7 +848,7 @@ winResizeWindowMultiWindow(WindowPtr pWin, int x, int y, unsigned int w,
 
     winScreenPriv(pScreen);
 
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
     ErrorF("ResizeWindowMultiWindow to (%d, %d) - %dx%d\n", x, y, w, h);
 #endif
     WIN_UNWRAP(ResizeWindow);
@@ -879,12 +879,12 @@ winAdjustXWindow(WindowPtr pWin, HWND hwnd)
 #define WIDTH(rc) (rc.right - rc.left)
 #define HEIGHT(rc) (rc.bottom - rc.top)
 
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
     ErrorF("winAdjustXWindow\n");
 #endif
 
     if (IsIconic(hwnd)) {
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
         ErrorF("\timmediately return because the window is iconized\n");
 #endif
         /*
@@ -902,21 +902,21 @@ winAdjustXWindow(WindowPtr pWin, HWND hwnd)
     x = pDraw->x + GetSystemMetrics(SM_XVIRTUALSCREEN);
     y = pDraw->y + GetSystemMetrics(SM_YVIRTUALSCREEN);
     SetRect(&rcDraw, x, y, x + pDraw->width, y + pDraw->height);
-#ifdef CYGMULTIWINDOW_DEBUG
+#ifdef ENABLE_DEBUG
     winDebug("\tDrawable extend {%d, %d, %d, %d}, {%d, %d}\n",
              (int)rcDraw.left, (int)rcDraw.top, (int)rcDraw.right, (int)rcDraw.bottom,
              (int)(rcDraw.right - rcDraw.left), (int)(rcDraw.bottom - rcDraw.top));
 #endif
     dwExStyle = GetWindowLongPtr(hwnd, GWL_EXSTYLE);
     dwStyle = GetWindowLongPtr(hwnd, GWL_STYLE);
-#ifdef CYGMULTIWINDOW_DEBUG
+#ifdef ENABLE_DEBUG
     winDebug("\tWindowStyle: %08x %08x\n", (unsigned int)dwStyle, (unsigned int)dwExStyle);
 #endif
     AdjustWindowRectEx(&rcDraw, dwStyle, FALSE, dwExStyle);
 
     /* The source of adjust */
     GetWindowRect(hwnd, &rcWin);
-#ifdef CYGMULTIWINDOW_DEBUG
+#ifdef ENABLE_DEBUG
     winDebug("\tWindow extend {%d, %d, %d, %d}, {%d, %d}\n",
              (int)rcWin.left, (int)rcWin.top, (int)rcWin.right, (int)rcWin.bottom,
              (int)(rcWin.right - rcWin.left), (int)(rcWin.bottom - rcWin.top));
@@ -927,7 +927,7 @@ winAdjustXWindow(WindowPtr pWin, HWND hwnd)
 
     if (EqualRect(&rcDraw, &rcWin)) {
         /* Bail if no adjust is needed */
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
         ErrorF("\treturn because already adjusted\n");
 #endif
         return 0;
@@ -949,7 +949,7 @@ winAdjustXWindow(WindowPtr pWin, HWND hwnd)
     vlist[1] = pDraw->y + dY - wBorderWidth(pWin);
     vlist[2] = pDraw->width + dW;
     vlist[3] = pDraw->height + dH;
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
     ErrorF("\tConfigureWindow to (%u, %u) - %ux%u\n",
            (unsigned int)vlist[0], (unsigned int)vlist[1],
            (unsigned int)vlist[2], (unsigned int)vlist[3]);
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index ac0ef6c25..a50d96bfd 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -77,8 +77,8 @@ extern void winDebug(const char *format, ...);
 extern void winReshapeMultiWindow(WindowPtr pWin);
 extern void winUpdateRgnMultiWindow(WindowPtr pWin);
 
-#ifndef CYGDEBUG
-#define CYGDEBUG NO
+#ifndef ENABLE_DEBUG
+#define ENABLE_DEBUG NO
 #endif
 
 /*
@@ -189,7 +189,7 @@ static Bool g_shutdown = FALSE;
  * Translate msg id to text, for debug purposes
  */
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
 static const char *
 MessageName(winWMMessagePtr msg)
 {
@@ -386,7 +386,7 @@ GetWindowName(WMInfoPtr pWMInfo, xcb_window_t iWin, char **ppWindowName)
     xcb_connection_t *conn = pWMInfo->conn;
     char *pszWindowName = NULL;
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("GetWindowName\n");
 #endif
 
@@ -791,7 +791,7 @@ winMultiWindowWMProc(void *pArg)
     /* Initialize the Window Manager */
     winInitMultiWindowWM(pWMInfo, pProcArg);
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("winMultiWindowWMProc ()\n");
 #endif
 
@@ -808,7 +808,7 @@ winMultiWindowWMProc(void *pArg)
             pthread_exit(NULL);
         }
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
         ErrorF("winMultiWindowWMProc - MSG: %s (%d) ID: %d\n",
                MessageName(&(pNode->msg)), (int)pNode->msg.msg, (int)pNode->msg.dwID);
 #endif
@@ -1002,7 +1002,7 @@ winMultiWindowWMProc(void *pArg)
     /* Free the passed-in argument */
     free(pProcArg);
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("-winMultiWindowWMProc ()\n");
 #endif
     return NULL;
@@ -1441,7 +1441,7 @@ winInitWM(void **ppWMInfo,
         return FALSE;
     }
 
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
     winDebug("winInitWM - Returning.\n");
 #endif
 
@@ -1631,7 +1631,7 @@ winSendMessageToWM(void *pWMInfo, winWMMessagePtr pMsg)
 {
     WMMsgNodePtr pNode;
 
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
     ErrorF("winSendMessageToWM %s\n", MessageName(pMsg));
 #endif
 
diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index 1c06e183c..2b64b724c 100644
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -429,7 +429,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     LRESULT ret;
     static Bool hasEnteredSizeMove = FALSE;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebugWin32Message("winTopLevelWindowProc", hwnd, message, wParam,
                          lParam);
 #endif
@@ -842,7 +842,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         if (wParam == VK_F4 && (GetKeyState(VK_MENU) & 0x8000))
             break;
 
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
         if (wParam == VK_ESCAPE) {
             /* Place for debug: put any tests and dumps here */
             WINDOWPLACEMENT windPlace;
@@ -1009,7 +1009,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
             HWND forHwnd = GetForegroundWindow();
 
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
             ErrorF("overridden window is shown\n");
 #endif
             if (forHwnd != NULL) {
@@ -1044,13 +1044,13 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         LPWINDOWPOS pWinPos = (LPWINDOWPOS) lParam;
 
         if (!(pWinPos->flags & SWP_NOZORDER)) {
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
             winDebug("\twindow z order was changed\n");
 #endif
             if (pWinPos->hwndInsertAfter == HWND_TOP
                 || pWinPos->hwndInsertAfter == HWND_TOPMOST
                 || pWinPos->hwndInsertAfter == HWND_NOTOPMOST) {
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
                 winDebug("\traise to top\n");
 #endif
                 /* Raise the window to the top in Z order */
@@ -1079,7 +1079,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 /* If this is top of X windows in Windows stack,
                    raise it in X stack. */
                 if (hWndAbove == NULL) {
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
                     winDebug("\traise to top\n");
 #endif
                     winRaiseWindow(pWin);
@@ -1105,7 +1105,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     case WM_SIZE:
         /* see dix/window.c */
-#if CYGWINDOWING_DEBUG
+#if ENABLE_DEBUG
     {
         char buf[64];
 
@@ -1209,7 +1209,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
         /* Check if this window needs to be made active when clicked */
         if (!GetProp(pWinPriv->hWnd, WIN_NEEDMANAGE_PROP)) {
-#if CYGMULTIWINDOW_DEBUG
+#if ENABLE_DEBUG
             ErrorF("winTopLevelWindowProc - WM_MOUSEACTIVATE - "
                    "MA_NOACTIVATE\n");
 #endif
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index e8990cc10..ef7d06a99 100644
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -250,7 +250,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
         }
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("ddxProcessArgument - arg: %s\n", argv[i]);
 #endif
 
@@ -283,7 +283,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
         int iWidth, iHeight, iX, iY;
         int iMonitor;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("ddxProcessArgument - screen - argc: %d i: %d\n", argc, i);
 #endif
 
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index ae6bc12a6..48d3e7a26 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -52,7 +52,7 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv)
     HDC hdc;
     DWORD dwInitialBPP;
 
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
     winDebug("winScreenInit - dwWidth: %u dwHeight: %u\n",
              (unsigned int)pScreenInfo->dwWidth, (unsigned int)pScreenInfo->dwHeight);
 #endif
@@ -194,7 +194,7 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv)
                pScreen->myNum, pScreen->x, pScreen->y);
     }
 
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
     winDebug("winScreenInit - returning\n");
 #endif
 
@@ -333,14 +333,14 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
 #endif
 
     /* Setup the cursor routines */
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winFinishScreenInitFB - Calling miDCInitialize ()\n");
 #endif
     miDCInitialize(pScreen, &g_winPointerCursorFuncs);
 
     /* KDrive does winCreateDefColormap right after miDCInitialize */
     /* Create a default colormap */
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winFinishScreenInitFB - Calling winCreateDefColormap ()\n");
 #endif
     if (!winCreateDefColormap(pScreen)) {
@@ -351,7 +351,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
     /* Initialize the shadow framebuffer layer */
     if ((pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI
          || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL)) {
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winFinishScreenInitFB - Calling shadowSetup ()\n");
 #endif
         if (!shadowSetup(pScreen)) {
@@ -473,7 +473,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
 
 
     if (pScreenInfo->fMultiWindow) {
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
         winDebug("winFinishScreenInitFB - Calling winInitWM.\n");
 #endif
 
@@ -496,7 +496,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
     /* Tell the server that we have a valid depth */
     pScreenPriv->fBadDepth = FALSE;
 
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
     winDebug("winFinishScreenInitFB - returning\n");
 #endif
 
diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c
index a604169c5..2884134b4 100644
--- a/hw/xwin/winshadddnl.c
+++ b/hw/xwin/winshadddnl.c
@@ -198,7 +198,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
         .dwSize = sizeof(DDPIXELFORMAT)
     };
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winAllocateFBShadowDDNL - w %u h %u d %u\n",
              (unsigned int)pScreenInfo->dwWidth,
              (unsigned int)pScreenInfo->dwHeight,
@@ -225,7 +225,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winAllocateFBShadowDDNL - Created a clipper\n");
 #endif
 
@@ -238,7 +238,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winAllocateFBShadowDDNL - Attached clipper to window\n");
 #endif
 
@@ -252,7 +252,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winAllocateFBShadowDDNL - Created and initialized DD\n");
 #endif
 
@@ -391,7 +391,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winAllocateFBShadowDDNL - Primary masks: %08x %08x %08x "
              "dwRGBBitCount: %u\n",
              (unsigned int)ddpfPrimary.u2.dwRBitMask,
@@ -434,7 +434,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
     winDebug("winAllocateFBShadowDDNL - Created shadow pitch: %d\n",
              (int) ddsdShadow.u1.lPitch);
 #endif
@@ -443,7 +443,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
     pScreenInfo->dwStride = (ddsdShadow.u1.lPitch * 8)
         / pScreenInfo->dwBPP;
 
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
     winDebug("winAllocateFBShadowDDNL - Created shadow stride: %d\n",
              (int) pScreenInfo->dwStride);
 #endif
@@ -456,7 +456,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
     pScreenPriv->dwGreenMask = ddsdShadow.u4.ddpfPixelFormat.u3.dwGBitMask;
     pScreenPriv->dwBlueMask = ddsdShadow.u4.ddpfPixelFormat.u4.dwBBitMask;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winAllocateFBShadowDDNL - Returning\n");
 #endif
 
@@ -599,7 +599,7 @@ winShadowUpdateDDNL(ScreenPtr pScreen, shadowBufPtr pBuf)
         DeleteObject(hrgnCombined);
         hrgnCombined = NULL;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winShadowUpdateDDNL - be x1 %d y1 %d x2 %d y2 %d\n",
                  pBoxExtents->x1, pBoxExtents->y1,
                  pBoxExtents->x2, pBoxExtents->y2);
@@ -652,7 +652,7 @@ winCloseScreenShadowDDNL(ScreenPtr pScreen)
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
     Bool fReturn = TRUE;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winCloseScreenShadowDDNL - Freeing screen resources\n");
 #endif
 
@@ -791,7 +791,7 @@ winInitVisualsShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winInitVisualsShadowDDNL - Returning\n");
 #endif
 
@@ -1136,7 +1136,7 @@ winDestroyColormapShadowDDNL(ColormapPtr pColormap)
      * we need to handle the default colormap in a special way.
      */
     if (pColormap->flags & IsDefault) {
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug
             ("winDestroyColormapShadowDDNL - Destroying default colormap\n");
 #endif
diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c
index 222d5e2f3..6b61d85e3 100644
--- a/hw/xwin/winshadgdi.c
+++ b/hw/xwin/winshadgdi.c
@@ -94,7 +94,7 @@ winQueryScreenDIBFormat(ScreenPtr pScreen, BITMAPINFOHEADER * pbmih)
     winScreenPriv(pScreen);
     HBITMAP hbmp;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     LPDWORD pdw = NULL;
 #endif
 
@@ -117,7 +117,7 @@ winQueryScreenDIBFormat(ScreenPtr pScreen, BITMAPINFOHEADER * pbmih)
         return FALSE;
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     /* Get a pointer to bitfields */
     pdw = (DWORD *) ((CARD8 *) pbmih + sizeof(BITMAPINFOHEADER));
 
@@ -196,7 +196,7 @@ winQueryRGBBitsAndMasks(ScreenPtr pScreen)
         /* Get a pointer to bitfields */
         pdw = (DWORD *) ((CARD8 *) pbmih + sizeof(BITMAPINFOHEADER));
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("%s - Masks: %08x %08x %08x\n", __FUNCTION__,
                  (unsigned int)pdw[0], (unsigned int)pdw[1], (unsigned int)pdw[2]);
         winDebug("%s - Bitmap: %dx%d %d bpp %d planes\n", __FUNCTION__,
@@ -342,7 +342,7 @@ winAllocateFBShadowGDI(ScreenPtr pScreen)
         return FALSE;
     }
     else {
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winAllocateFBShadowGDI - Shadow buffer allocated\n");
 #endif
     }
@@ -350,7 +350,7 @@ winAllocateFBShadowGDI(ScreenPtr pScreen)
     /* Get information about the bitmap that was allocated */
     GetObject(pScreenPriv->hbmpShadow, sizeof(dibsection), &dibsection);
 
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
     /* Print information about bitmap allocated */
     winDebug("winAllocateFBShadowGDI - Dibsection width: %d height: %d "
              "depth: %d size image: %d\n",
@@ -361,7 +361,7 @@ winAllocateFBShadowGDI(ScreenPtr pScreen)
     /* Select the shadow bitmap into the shadow DC */
     SelectObject(pScreenPriv->hdcShadow, pScreenPriv->hbmpShadow);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winAllocateFBShadowGDI - Attempting a shadow blit\n");
 #endif
 
@@ -371,7 +371,7 @@ winAllocateFBShadowGDI(ScreenPtr pScreen)
                      pScreenInfo->dwWidth, pScreenInfo->dwHeight,
                      pScreenPriv->hdcShadow, 0, 0, SRCCOPY);
     if (fReturn) {
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winAllocateFBShadowGDI - Shadow blit success\n");
 #endif
     }
@@ -397,7 +397,7 @@ winAllocateFBShadowGDI(ScreenPtr pScreen)
                               / dibsection.dsBmih.biHeight)
                              * 8) / pScreenInfo->dwBPP;
 
-#if CYGDEBUG || YES
+#if ENABLE_DEBUG || YES
     winDebug("winAllocateFBShadowGDI - Created shadow stride: %d\n",
              (int) pScreenInfo->dwStride);
 #endif
@@ -573,7 +573,7 @@ winCloseScreenShadowGDI(ScreenPtr pScreen)
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
     Bool fReturn = TRUE;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winCloseScreenShadowGDI - Freeing screen resources\n");
 #endif
 
@@ -698,7 +698,7 @@ winInitVisualsShadowGDI(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winInitVisualsShadowGDI - Returning\n");
 #endif
 
@@ -1002,13 +1002,13 @@ winRealizeInstalledPaletteShadowGDI(ScreenPtr pScreen)
     winScreenPriv(pScreen);
     winPrivCmapPtr pCmapPriv = NULL;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winRealizeInstalledPaletteShadowGDI\n");
 #endif
 
     /* Don't do anything if there is not a colormap */
     if (pScreenPriv->pcmapInstalled == NULL) {
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winRealizeInstalledPaletteShadowGDI - No colormap "
                  "installed\n");
 #endif
@@ -1210,7 +1210,7 @@ winDestroyColormapShadowGDI(ColormapPtr pColormap)
      * we need to handle the default colormap in a special way.
      */
     if (pColormap->flags & IsDefault) {
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winDestroyColormapShadowGDI - Destroying default "
                  "colormap\n");
 #endif
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 934f6d845..60be32da4 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -61,7 +61,7 @@ winCreateWindowRootless(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winTrace("winCreateWindowRootless (%p)\n", pWin);
 #endif
 
@@ -86,7 +86,7 @@ winDestroyWindowRootless(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winTrace("winDestroyWindowRootless (%p)\n", pWin);
 #endif
 
@@ -115,7 +115,7 @@ winPositionWindowRootless(WindowPtr pWin, int x, int y)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winTrace("winPositionWindowRootless (%p)\n", pWin);
 #endif
 
@@ -139,7 +139,7 @@ winChangeWindowAttributesRootless(WindowPtr pWin, unsigned long mask)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winTrace("winChangeWindowAttributesRootless (%p)\n", pWin);
 #endif
 
@@ -165,7 +165,7 @@ winUnmapWindowRootless(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winTrace("winUnmapWindowRootless (%p)\n", pWin);
 #endif
 
@@ -195,7 +195,7 @@ winMapWindowRootless(WindowPtr pWin)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winTrace("winMapWindowRootless (%p)\n", pWin);
 #endif
 
@@ -217,7 +217,7 @@ winSetShapeRootless(WindowPtr pWin, int kind)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winTrace("winSetShapeRootless (%p, %i)\n", pWin, kind);
 #endif
 
@@ -247,7 +247,7 @@ winAddRgn(WindowPtr pWin, void *data)
 
     /* If pWin is not Root */
     if (pWin->parent != NULL) {
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winAddRgn ()\n");
 #endif
         if (pWin->mapped) {
@@ -320,7 +320,7 @@ winReshapeRootless(WindowPtr pWin)
 
     winWindowPriv(pWin);
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebug("winReshapeRootless ()\n");
 #endif
 
diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h
index 92a839c4d..2ad4b475e 100644
--- a/hw/xwin/winwindow.h
+++ b/hw/xwin/winwindow.h
@@ -57,12 +57,6 @@
 #endif
 #define WIN_WID_PROP		"cyg_wid_prop_rl"
 #define WIN_NEEDMANAGE_PROP	"cyg_override_redirect_prop_rl"
-#ifndef CYGMULTIWINDOW_DEBUG
-#define CYGMULTIWINDOW_DEBUG    NO
-#endif
-#ifndef CYGWINDOWING_DEBUG
-#define CYGWINDOWING_DEBUG	NO
-#endif
 
 #define XMING_SIGNATURE		0x12345678L
 
diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c
index 3953b66d8..2509018b6 100644
--- a/hw/xwin/winwndproc.c
+++ b/hw/xwin/winwndproc.c
@@ -69,7 +69,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     int iScanCode;
     int i;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
     winDebugWin32Message("winWindowProc", hwnd, message, wParam, lParam);
 #endif
 
@@ -82,7 +82,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     /* Only retrieve new privates pointers if window handle is null or changed */
     if ((s_pScreenPriv == NULL || hwnd != s_hwndLastPrivates)
         && (s_pScreenPriv = GetProp(hwnd, WIN_SCR_PROP)) != NULL) {
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - Setting privates handle\n");
 #endif
         s_pScreenInfo = s_pScreenPriv->pScreenInfo;
@@ -103,7 +103,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                                     s_pScreenPriv);
 
     case WM_CREATE:
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - WM_CREATE\n");
 #endif
 
@@ -299,7 +299,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         RECT rcWindow;
         int iWidth, iHeight;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - WM_SIZE\n");
 #endif
 
@@ -437,7 +437,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         SCROLLINFO si;
         int iVertPos;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - WM_VSCROLL\n");
 #endif
 
@@ -516,7 +516,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         SCROLLINFO si;
         int iHorzPos;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - WM_HSCROLL\n");
 #endif
 
@@ -595,7 +595,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         int iCaptionHeight;
         int iBorderHeight, iBorderWidth;
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %p\n",
                  s_pScreenInfo);
 #endif
@@ -634,7 +634,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         return 0;
 
     case WM_ERASEBKGND:
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - WM_ERASEBKGND\n");
 #endif
         /*
@@ -645,7 +645,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         return TRUE;
 
     case WM_PAINT:
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - WM_PAINT\n");
 #endif
         /* Only paint if we have privates and the server is enabled */
@@ -667,7 +667,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     case WM_PALETTECHANGED:
     {
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - WM_PALETTECHANGED\n");
 #endif
         /*
@@ -904,7 +904,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     case WM_MOUSEWHEEL:
         if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
             break;
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - WM_MOUSEWHEEL\n");
 #endif
         /* Button4 = WheelUp */
@@ -915,7 +915,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     case WM_MOUSEHWHEEL:
         if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
             break;
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - WM_MOUSEHWHEEL\n");
 #endif
         /* Button7 = TiltRight */
@@ -1071,7 +1071,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             return 0;
         }
 
-#if CYGDEBUG
+#if ENABLE_DEBUG
         winDebug("winWindowProc - WM_ACTIVATE\n");
 #endif
 
@@ -1097,7 +1097,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
             break;
 
-#if CYGDEBUG || TRUE
+#if ENABLE_DEBUG || TRUE
         winDebug("winWindowProc - WM_ACTIVATEAPP\n");
 #endif
 
diff --git a/include/meson.build b/include/meson.build
index eed46817e..9a53d2359 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -411,10 +411,7 @@ xwin_data.set('HAS_DEVWINDOWS', host_machine.system() == 'cygwin' ? '1' : false,
               description: 'Has /dev/windows for signaling new win32 messages')
 xwin_data.set('RELOCATE_PROJECTROOT', host_machine.system() == 'windows' ? '1' : false,
               description: 'Make paths relative to the xserver installation location')
-# XXX: these three are all the same as DEBUG so we should just change to that
-xwin_data.set10('CYGDEBUG', enable_debugging)
-xwin_data.set10('CYGWINDOWING_DEBUG',enable_debugging)
-xwin_data.set10('CYGMULTIWINDOW_DEBUG', enable_debugging)
+xwin_data.set10('ENABLE_DEBUG', enable_debugging)
 
 configure_file(output : 'xwin-config.h',
                input : 'xwin-config.h.meson.in',
diff --git a/include/xwin-config.h.meson.in b/include/xwin-config.h.meson.in
index 993227398..e2f4ada61 100644
--- a/include/xwin-config.h.meson.in
+++ b/include/xwin-config.h.meson.in
@@ -13,9 +13,7 @@
 #mesondefine HAS_DEVWINDOWS
 
 /* Switch on debug messages */
-#mesondefine CYGDEBUG
-#mesondefine CYGWINDOWING_DEBUG
-#mesondefine CYGMULTIWINDOW_DEBUG
+#mesondefine ENABLE_DEBUG
 
 /* Default log location */
 #mesondefine DEFAULT_LOGDIR