diff --git a/ChangeLog b/ChangeLog
index d4667c08a..3b37b1f7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-07  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet-dbus-info.c, gnome/applet/applet.c,
+	  gnome/applet/applet.h, gnome/vpn-properties/nm-vpn-properties.c,
+	  src/dhcp-manager/nm-dhcp-manager.c, test/libnm_glib_test.c,
+	  test/nmtest.c test/nmtestdevices.c: mark functions 'static' as
+	  appropriate
+
 2005-10-07  Robert Love  <rml@novell.com>
 
 	* configure.in: Change our compile flags for the betterment of mankind.
diff --git a/gnome/applet/applet-dbus-info.c b/gnome/applet/applet-dbus-info.c
index d488d3c7b..2ec83e810 100644
--- a/gnome/applet/applet-dbus-info.c
+++ b/gnome/applet/applet-dbus-info.c
@@ -57,8 +57,11 @@ static inline gboolean nmi_network_type_valid (NMNetworkType type)
  * Make a DBus error message
  *
  */
-DBusMessage *nmi_dbus_create_error_message (DBusMessage *message, const char *exception_namespace,
-										const char *exception, const char *format, ...)
+static DBusMessage *nmi_dbus_create_error_message (DBusMessage *message,
+								const char *exception_namespace,
+								const char *exception,
+								const char *format,
+								...)
 {
 	char *		exception_text;
 	DBusMessage *	reply_message;
diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c
index 3c39a8675..08276289d 100644
--- a/gnome/applet/applet.c
+++ b/gnome/applet/applet.c
@@ -814,7 +814,7 @@ VPNConnection *nmwa_get_first_active_vpn_connection (NMWirelessApplet *applet)
 	return NULL;
 }
 
-VPNConnection *nmwa_get_first_activating_vpn_connection (NMWirelessApplet *applet)
+static VPNConnection *nmwa_get_first_activating_vpn_connection (NMWirelessApplet *applet)
 {
 	VPNConnection *	vpn;
 	GSList *			elt;
diff --git a/gnome/applet/applet.h b/gnome/applet/applet.h
index 7c875804e..9e620d8ed 100644
--- a/gnome/applet/applet.h
+++ b/gnome/applet/applet.h
@@ -52,6 +52,7 @@ enum NMWAEncryptionKeyTypes
 	KEY_TYPE_HEX_KEY = 2
 };
 
+static GType nmwa_get_type (void); /* prototype for G_DEFINE_TYPE */
 
 #define NM_TYPE_WIRELESS_APPLET			(nmwa_get_type())
 #define NM_WIRELESS_APPLET(object)			(G_TYPE_CHECK_INSTANCE_CAST((object), NM_TYPE_WIRELESS_APPLET, NMWirelessApplet))
diff --git a/gnome/vpn-properties/nm-vpn-properties.c b/gnome/vpn-properties/nm-vpn-properties.c
index 4df939156..bac2a091e 100644
--- a/gnome/vpn-properties/nm-vpn-properties.c
+++ b/gnome/vpn-properties/nm-vpn-properties.c
@@ -887,7 +887,7 @@ load_properties_module (GSList **vpn_types, const char *path)
 	}
 
 	if (!g_module_symbol (module, "nm_vpn_properties_factory", 
-			      (gpointer *) &nm_vpn_properties_factory)) {
+			      (gpointer) &nm_vpn_properties_factory)) {
 		
 		g_warning ("Cannot locate function 'nm_vpn_properties_factory' in '%s': %s", 
 			   path, g_module_error ());
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index ea77568ce..033a16a02 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -190,7 +190,7 @@ guint8 nm_dhcp_manager_get_state_for_device (NMDHCPManager *manager, NMDevice *d
  * Called after timeout of a DHCP transaction to notify device of the failure.
  *
  */
-gboolean nm_dhcp_manager_handle_timeout (NMActRequest *req)
+static gboolean nm_dhcp_manager_handle_timeout (NMActRequest *req)
 {
 	NMData *		data;
 	NMDevice *	dev;
diff --git a/test/libnm_glib_test.c b/test/libnm_glib_test.c
index 248bb7d93..ac5b2eafa 100644
--- a/test/libnm_glib_test.c
+++ b/test/libnm_glib_test.c
@@ -26,7 +26,7 @@
 #include "libnm_glib.h"
 
 
-void status_printer (libnm_glib_ctx *ctx, gpointer user_data)
+static void status_printer (libnm_glib_ctx *ctx, gpointer user_data)
 {
 	libnm_glib_state	state;
 
diff --git a/test/nmtest.c b/test/nmtest.c
index c50a26601..f20283c9a 100644
--- a/test/nmtest.c
+++ b/test/nmtest.c
@@ -200,7 +200,7 @@ static int nmwa_dbus_call_nm_method (DBusConnection *con, const char *path, cons
 	return (RETURN_SUCCESS);
 }
 
-char * get_active_device (DBusConnection *connection)
+static char * get_active_device (DBusConnection *connection)
 {
 	int	 ret;
 	char *active_device = NULL;
@@ -213,7 +213,7 @@ char * get_active_device (DBusConnection *connection)
 }
 
 
-char * get_object_name (DBusConnection *connection, char *path)
+static char * get_object_name (DBusConnection *connection, char *path)
 {
 	int	 ret;
 	char *name = NULL;
@@ -228,7 +228,7 @@ char * get_object_name (DBusConnection *connection, char *path)
 }
 
 
-int get_object_signal_strength (DBusConnection *connection, char *path)
+static int get_object_signal_strength (DBusConnection *connection, char *path)
 {
 	int	 ret;
 	int strength = -1;
@@ -243,7 +243,7 @@ int get_object_signal_strength (DBusConnection *connection, char *path)
 }
 
 
-NMState get_nm_state (DBusConnection *connection)
+static NMState get_nm_state (DBusConnection *connection)
 {
 	int	 	ret;
 	NMState	state;
@@ -256,7 +256,7 @@ NMState get_nm_state (DBusConnection *connection)
 }
 
 
-char * get_device_active_network (DBusConnection *connection, char *path)
+static char * get_device_active_network (DBusConnection *connection, char *path)
 {
 	int	 ret;
 	char *net = NULL;
@@ -269,7 +269,7 @@ char * get_device_active_network (DBusConnection *connection, char *path)
 }
 
 
-int get_device_type (DBusConnection *connection, char *path)
+static int get_device_type (DBusConnection *connection, char *path)
 {
 	int	ret;
 	int	type = -1;
@@ -282,7 +282,7 @@ int get_device_type (DBusConnection *connection, char *path)
 }
 
 
-void print_device_networks (DBusConnection *connection, const char *path)
+static void print_device_networks (DBusConnection *connection, const char *path)
 {
 	int	  ret;
 	char **networks = NULL;
@@ -307,7 +307,7 @@ void print_device_networks (DBusConnection *connection, const char *path)
 }
 
 
-void print_devices (DBusConnection *connection)
+static void print_devices (DBusConnection *connection)
 {
 	int	  ret;
 	char **devices = NULL;
@@ -346,7 +346,7 @@ void print_devices (DBusConnection *connection)
 }
 
 
-void set_device_network (DBusConnection *connection, const char *path, const char *network)
+static void set_device_network (DBusConnection *connection, const char *path, const char *network)
 {
 	DBusMessage 	*message;
 	DBusMessage 	*reply;
diff --git a/test/nmtestdevices.c b/test/nmtestdevices.c
index 9b656300d..ad9a25b85 100644
--- a/test/nmtestdevices.c
+++ b/test/nmtestdevices.c
@@ -30,7 +30,7 @@
 
 #include "NetworkManager.h"
 
-void create_device (DBusConnection *connection, NMDeviceType type)
+static void create_device (DBusConnection *connection, NMDeviceType type)
 {
 	DBusMessage	*message;
 	DBusMessage	*reply;
@@ -81,7 +81,7 @@ void create_device (DBusConnection *connection, NMDeviceType type)
 }
 
 
-void remove_device (DBusConnection *connection, char *dev)
+static void remove_device (DBusConnection *connection, char *dev)
 {
 	DBusMessage	*message;
 	DBusMessage	*reply;
@@ -120,7 +120,7 @@ void remove_device (DBusConnection *connection, char *dev)
 }
 
 
-void set_link_active (DBusConnection *connection, char *dev, gboolean active)
+static void set_link_active (DBusConnection *connection, char *dev, gboolean active)
 {
 	DBusMessage	*message;
 	DBusMessage	*reply;