diff --git a/Makefile.am b/Makefile.am
index f6e1d123..9df3ccec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,8 @@ src_iwd_SOURCES = src/main.c linux/nl80211.h linux/kdbus.h \
 					src/sha1.h src/sha1.c \
 					src/ie.h src/ie.c \
 					src/dbus.h src/dbus.c \
-					src/manager.h src/manager.c
+					src/manager.h src/manager.c \
+					iwd.h
 src_iwd_LDADD = ell/libell-internal.la
 
 client_iwctl_SOURCES = client/main.c linux/kdbus.h \
diff --git a/src/iwd.h b/src/iwd.h
new file mode 100644
index 00000000..2493d4b1
--- /dev/null
+++ b/src/iwd.h
@@ -0,0 +1,23 @@
+/*
+ *
+ *  Wireless daemon for Linux
+ *
+ *  Copyright (C) 2013-2014  Intel Corporation. All rights reserved.
+ *
+ *  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
+ *
+ */
+
+#define uninitialized_var(x) x = x
diff --git a/src/wiphy.c b/src/wiphy.c
index aa149aef..512987ef 100644
--- a/src/wiphy.c
+++ b/src/wiphy.c
@@ -32,6 +32,7 @@
 #include <ell/ell.h>
 
 #include "linux/nl80211.h"
+#include "src/iwd.h"
 #include "src/ie.h"
 #include "src/wiphy.h"
 #include "src/dbus.h"
@@ -896,9 +897,9 @@ static void wiphy_scan_notify(struct l_genl_msg *msg, void *user_data)
 	uint16_t type, len;
 	const void *data;
 	uint8_t cmd;
-	uint32_t attr_ifindex;
+	uint32_t uninitialized_var(attr_ifindex);
 	bool have_ifindex;
-	uint32_t attr_wiphy;
+	uint32_t uninitialized_var(attr_wiphy);
 	bool have_wiphy;
 
 	cmd = l_genl_msg_get_command(msg);