diff --git a/ChangeLog b/ChangeLog
index 604f393559..9191658730 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-19  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* panel-applet/NMWirelessApplet.c: #include <config.h> must be
+	the first include for working i18n. Also, don't include it in .h files
+	* panel-applet/NMWirelessApplet.h: Same
+	* panel-applet/NMWirelessAppletOtherNetworkDialog.c: Same
+	* panel-applet/menu-info.c: Same
+
 2005-01-18  Dan Williams <dcbw@redhat.com>
 
 	* dhcpcd/client.c
diff --git a/panel-applet/NMWirelessApplet.c b/panel-applet/NMWirelessApplet.c
index d80aba1930..38a719bacb 100644
--- a/panel-applet/NMWirelessApplet.c
+++ b/panel-applet/NMWirelessApplet.c
@@ -26,6 +26,10 @@
  * (C) Copyright 2001, 2002 Free Software Foundation
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -36,8 +40,6 @@
 #include <math.h>
 #include <dirent.h>
 
-#include "config.h"
-
 #include <gnome.h>
 
 #include <libgnomeui/libgnomeui.h>
diff --git a/panel-applet/NMWirelessApplet.h b/panel-applet/NMWirelessApplet.h
index a3cdb31a02..257e890d23 100644
--- a/panel-applet/NMWirelessApplet.h
+++ b/panel-applet/NMWirelessApplet.h
@@ -21,7 +21,6 @@
 
 #ifndef NM_WIRELESS_APPLET_H
 #define NM_WIRELESS_APPLET_H
-#include "config.h"
 #include <gnome.h>
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
diff --git a/panel-applet/NMWirelessAppletOtherNetworkDialog.c b/panel-applet/NMWirelessAppletOtherNetworkDialog.c
index c8c3e9910a..c0d18590d5 100644
--- a/panel-applet/NMWirelessAppletOtherNetworkDialog.c
+++ b/panel-applet/NMWirelessAppletOtherNetworkDialog.c
@@ -26,11 +26,13 @@
  * (C) Copyright 2001, 2002 Free Software Foundation
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <stdlib.h>
 
-#include "config.h"
-
 #include <gnome.h>
 #include <libgnomeui/libgnomeui.h>
 #include <glade/glade.h>
diff --git a/panel-applet/menu-info.c b/panel-applet/menu-info.c
index ed46ad5b36..c7c333bc1e 100644
--- a/panel-applet/menu-info.c
+++ b/panel-applet/menu-info.c
@@ -25,13 +25,17 @@
  * (C) Copyright 2004 Red Hat, Inc.
  * Copyright (C) 1999, 2000 Eazel, Inc.
  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <libintl.h>
 #include <string.h>
 #include "menu-info.h"
 #include "gtkcellview.h"
 #include "gtkcellrendererprogress.h"
 #include "NMWirelessAppletDbus.h"
-#include <config.h>
 
 static gboolean nm_menu_wired_expose_event    (GtkWidget *widget, GdkEventExpose *event);
 static gboolean nm_menu_wireless_expose_event (GtkWidget *widget, GdkEventExpose *event);