6 files changed, 6 insertions, 8 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 9d9c2cff..a79e343b 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -32,7 +32,7 @@
 #include <sys/timeb.h>
 #include <process.h>
 #include <io.h>
-#include "dirent-win32.h"
+#include "../dirent-win32/dirent-win32.h"
 #else
 #include <unistd.h>
 #include <pwd.h>
@@ -57,11 +57,9 @@
 #include <socks.h>
 #endif
 
-#ifndef ENABLE_NLS
 #ifndef HAVE_SNPRINTF
 #define snprintf g_snprintf
 #endif
-#endif
 
 #ifdef USE_DEBUG
 
diff --git a/src/common/xchat.h b/src/common/xchat.h
index 9db44c3f..b4e652c9 100644
--- a/src/common/xchat.h
+++ b/src/common/xchat.h
@@ -8,7 +8,6 @@
 
 #include "history.h"
 
-#ifndef ENABLE_NLS
 #ifndef HAVE_SNPRINTF
 #define snprintf g_snprintf
 #endif
@@ -16,7 +15,6 @@
 #ifndef HAVE_VSNPRINTF
 #define vsnprintf _vsnprintf
 #endif
-#endif
 
 #ifdef USE_DEBUG
 #define malloc(n) xchat_malloc(n, __FILE__, __LINE__)
@@ -79,6 +77,10 @@ void *xchat_realloc (char *old, int len, char *file, int line);
 #define USERNAMELEN 10
 #define HIDDEN_CHAR	8			/* invisible character for xtext */
 
+#ifdef __cplusplus
+#define asdfasdf
+#endif
+
 #if defined(ENABLE_NLS) && !defined(_)
 #  include <libintl.h>
 #  define _(x) gettext(x)
diff --git a/src/common/dirent-win32.c b/src/dirent-win32/dirent-win32.c
index 273c6732..273c6732 100644
--- a/src/common/dirent-win32.c
+++ b/src/dirent-win32/dirent-win32.c
diff --git a/src/common/dirent-win32.h b/src/dirent-win32/dirent-win32.h
index cbb753e6..cbb753e6 100644
--- a/src/common/dirent-win32.h
+++ b/src/dirent-win32/dirent-win32.h
diff --git a/src/fe-gtk/custom-list.c b/src/fe-gtk/custom-list.c
index ac20e0ff..0c3c40b5 100644
--- a/src/fe-gtk/custom-list.c
+++ b/src/fe-gtk/custom-list.c
@@ -106,7 +106,7 @@ custom_list_sortable_init (GtkTreeSortableIface * iface)
  *
  *****************************************************************************/
 
-static GType
+GType
 custom_list_get_type (void)
 {
 	static GType custom_list_type = 0;
diff --git a/src/fe-gtk/xchat.rc b/src/fe-gtk/xchat.rc
index 28676b83..f63b70e7 100644
--- a/src/fe-gtk/xchat.rc
+++ b/src/fe-gtk/xchat.rc
@@ -2,8 +2,6 @@
 #include "../../config.h"
 #include "../../resource.h"
 
-1 24 "xchat.exe.manifest"
-
 XC_ICON ICON "../../xchat.ico" 
 
 VS_VERSION_INFO VERSIONINFO