diff --git a/fpga/include/villas/fpga/card.hpp b/fpga/include/villas/fpga/card.hpp
index f9d78151a..d4b4b5cc2 100644
--- a/fpga/include/villas/fpga/card.hpp
+++ b/fpga/include/villas/fpga/card.hpp
@@ -98,8 +98,9 @@ public:	// TODO: make this private
 
 	std::string name;			/**< The name of the FPGA card */
 
-	struct pci *pci;
+	struct pci* pci;
 	struct pci_device filter;		/**< Filter for PCI device. */
+	struct pci_device* pdev;		/**< PCI device handle */
 
 	/// The VFIO container that this card is part of
 	std::shared_ptr<VfioContainer> vfioContainer;
diff --git a/fpga/lib/card.cpp b/fpga/lib/card.cpp
index fb7369823..4581d7482 100644
--- a/fpga/lib/card.cpp
+++ b/fpga/lib/card.cpp
@@ -203,10 +203,8 @@ PCIeCard::mapMemoryBlock(const MemoryBlock& block)
 
 
 bool
-fpga::PCIeCard::init()
+PCIeCard::init()
 {
-	struct pci_device *pdev;
-
 	auto& mm = MemoryManager::get();
 	logger = getLogger();