diff --git a/src/firewall-manager/Makefile.am b/src/firewall-manager/Makefile.am
index f190bb725..1b98d6a73 100644
--- a/src/firewall-manager/Makefile.am
+++ b/src/firewall-manager/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES = \
 noinst_LTLIBRARIES = libfirewall-manager.la
 
 libfirewall_manager_la_SOURCES = \
-	nm-firewall-types.h \
 	nm-firewall-manager.h \
 	nm-firewall-manager.c
 
diff --git a/src/firewall-manager/nm-firewall-manager.h b/src/firewall-manager/nm-firewall-manager.h
index 7d703b291..fc844e2f5 100644
--- a/src/firewall-manager/nm-firewall-manager.h
+++ b/src/firewall-manager/nm-firewall-manager.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
-#include "nm-firewall-types.h"
 
 #define FIREWALL_DBUS_SERVICE	"org.fedoraproject.FirewallD"
 #define FIREWALL_DBUS_PATH		"/org/fedoraproject/FirewallD"
@@ -41,13 +40,11 @@ G_BEGIN_DECLS
 
 #define NM_FIREWALL_MANAGER_AVAILABLE "available"
 
-struct _NMFirewallManager
-{
+typedef struct {
 	GObject parent;
-};
+} NMFirewallManager;
 
-typedef struct
-{
+typedef struct {
 	GObjectClass parent;
 } NMFirewallManagerClass;
 
diff --git a/src/firewall-manager/nm-firewall-types.h b/src/firewall-manager/nm-firewall-types.h
deleted file mode 100644
index 5d0b45668..000000000
--- a/src/firewall-manager/nm-firewall-types.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2011 Red Hat, Inc.
- */
-
-#ifndef NM_FIREWALL_TYPES_H
-#define NM_FIREWALL_TYPES_H
-
-typedef struct _NMFirewallManager NMFirewallManager;
-
-#endif  /* NM_FIREWALL_TYPES_H */