diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 28ab13d0..ad61238a 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 project(fuel-tools-examples)
 
 # Find the Gazebo Fuel Tools library
-find_package(gz-fuel_tools9 QUIET REQUIRED)
-set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools9_VERSION_MAJOR})
+find_package(gz-fuel_tools8 QUIET REQUIRED)
+set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools8_VERSION_MAJOR})
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-FUEL-TOOLS_CXX_FLAGS}")
 
diff --git a/src/FuelClient.cc b/src/FuelClient.cc
index 23d87082..7bbf7f4b 100644
--- a/src/FuelClient.cc
+++ b/src/FuelClient.cc
@@ -15,12 +15,12 @@
  *
 */
 
-#ifdef _MSC_VER
-#pragma warning(push, 0)
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable: 4251)  // foo needs to have dll-interface
 #endif
 #include <google/protobuf/text_format.h>
-#include <gz/msgs/fuel_metadata.pb.h>
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif
 
@@ -36,6 +36,7 @@
 #include <gz/common/Filesystem.hh>
 #include <gz/common/Util.hh>
 
+#include <gz/msgs/fuel_metadata.pb.h>
 #include <gz/msgs/Utility.hh>
 
 #include "gz/fuel_tools/ClientConfig.hh"
diff --git a/src/Interface.cc b/src/Interface.cc
index cdf90bcb..d2c5e82e 100644
--- a/src/Interface.cc
+++ b/src/Interface.cc
@@ -15,15 +15,17 @@
  *
 */
 
-#ifdef _MSC_VER
-#pragma warning(push, 0)
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable: 4251)  // foo needs to have dll-interface
 #endif
 #include <google/protobuf/text_format.h>
-#include <gz/msgs/fuel_metadata.pb.h>
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif
 
+#include <gz/msgs/fuel_metadata.pb.h>
+
 #include <gz/msgs/Utility.hh>
 #include "gz/common/Console.hh"
 #include "gz/fuel_tools/Interface.hh"
diff --git a/src/gz.cc b/src/gz.cc
index f34902f3..f7841413 100644
--- a/src/gz.cc
+++ b/src/gz.cc
@@ -19,25 +19,20 @@
 #include <string.h>
 #include <tinyxml2.h>
 
-#ifdef _MSC_VER
-#pragma warning(push, 0)
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable: 4251)  // foo needs to have dll-interface
 #endif
 #include <google/protobuf/text_format.h>
-#include <gz/msgs/fuel_metadata.pb.h>
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif
 
 #include <csignal>
 #include <exception>
 
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
+#include <gz/msgs/fuel_metadata.pb.h>
 #include <gz/msgs/Utility.hh>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #ifdef _WIN32
 // DELETE is defined in winnt.h and causes a problem with REST::DELETE