diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 32d8754ba25..3ce0e25f4b6 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
 
 #define DRIVER_MASK 0x80000000
 #define DEVICE_MASK 0x40000000
+#define MAX_NAME_LENGTH 64
 
 typedef DWORD (WINAPI * MessagePtr)(UINT, UINT, DWORD, DWORD, DWORD);
 
@@ -80,6 +81,12 @@ static const char* DSound_Bits[] = {
   NULL
 };
 
+typedef struct
+{
+  UINT nameID;
+  const char *szDriver;
+} AUDIO_DRIVER;
+
 static const AUDIO_DRIVER sAudioDrivers[] = {
   {IDS_DRIVER_ALSA,      "alsa"},
   {IDS_DRIVER_OSS,       "oss"},
diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c
index 0b07bdf8677..e8c843a430d 100644
--- a/programs/winecfg/drivedetect.c
+++ b/programs/winecfg/drivedetect.c
@@ -43,6 +43,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
 BOOL gui_mode = TRUE;
 static long working_mask = 0;
 
+typedef struct
+{
+  const char *szNode;
+  int nType;
+} DEV_NODES;
+
 #ifdef HAVE_MNTENT_H
 
 static const DEV_NODES sDeviceNodes[] = {
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
index 6fc77f7b140..f9f561dbe87 100644
--- a/programs/winecfg/main.c
+++ b/programs/winecfg/main.c
@@ -31,7 +31,6 @@
 #include <objbase.h>
 #include <wine/debug.h>
 
-#include "properties.h"
 #include "resource.h"
 #include "winecfg.h"
 
diff --git a/programs/winecfg/properties.h b/programs/winecfg/properties.h
deleted file mode 100644
index 8ff17c6ea23..00000000000
--- a/programs/winecfg/properties.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * WineCfg configuration properties
- *
- * Copyright 2002 Jaco Greeff
- * Copyright 2003 Dimitrie O. Paun
- * Copyright 2003 Mark Westcott
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
-
-#ifndef WINE_CFG_PROPERTIES_H
-#define WINE_CFG_PROPERTIES_H
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "commctrl.h"
-
-#define MAX_NAME_LENGTH         64
-#define MAX_VERSION_LENGTH      48
-#define MAX_DESCRIPTION_LENGTH 128
-
-#define DLL_NATIVE  0x0000
-#define DLL_BUILTIN 0x0001
-
-typedef struct
-{
-    char  szName[MAX_NAME_LENGTH];
-    int   nType;
-} DLL_DESC;
-
-typedef struct
-{
-    char  szName[MAX_NAME_LENGTH];
-    char  szWinVer[MAX_VERSION_LENGTH];
-    char  szDOSVer[MAX_VERSION_LENGTH];
-    HDPA  DLLs;
-} APP_DESC;
-
-typedef struct
-{
-  UINT nameID;
-  char szDriver[MAX_NAME_LENGTH];
-} AUDIO_DRIVER;
-
-typedef struct
-{
-    char   szX11Display[MAX_NAME_LENGTH];
-    int    nSysColors;
-    int    nPrivateMap;
-    int    nPerfect;
-    int    nDepth;
-    int    nManaged;
-    int    nDesktopSizeX;
-    int    nDesktopSizeY;
-    int    nDGA;
-    int    nXVidMode;
-    int    nXShm;
-    int    nTextCP;
-    int    nXVideoPort;
-    int    nTakeFocus;
-    int    nDXGrab;
-    int    nDoubleBuffered;
-    int    nSynchronous;
-} X11DRV_DESC;
-
-typedef struct
-{
-  char szNode[MAX_NAME_LENGTH];
-  int nType;
-} DEV_NODES;
-
-#endif
diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
index 7b0006a4be7..f18b75cea04 100644
--- a/programs/winecfg/winecfg.h
+++ b/programs/winecfg/winecfg.h
@@ -31,7 +31,7 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
-#include "properties.h"
+#include "commctrl.h"
 
 #define IS_OPTION_TRUE(ch) \
     ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')