Use forward declaration instead of header includes

Summary: As title Reviewed By: ninas Differential Revision: D8461413 fbshipit-source-id: 278b43ffbc472062958aa20732500ac05d2ffecb
facebook · Jun 16, 2018 · e440fcd · e440fcd
1 parent 3250255
commit e440fcd
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/fboss/agent/hw/bcm/BcmAclTable.cpp b/fboss/agent/hw/bcm/BcmAclTable.cpp
@@ -10,6 +10,7 @@
 #include "fboss/agent/hw/bcm/BcmAclTable.h"
 #include "fboss/agent/hw/bcm/BcmAclEntry.h"
 #include "fboss/agent/hw/bcm/BcmAclRange.h"
+#include "fboss/agent/hw/bcm/BcmStatUpdater.h"
 #include "fboss/agent/hw/bcm/BcmSwitch.h"
 #include "fboss/agent/hw/bcm/BcmWarmBootCache.h"
 #include "fboss/agent/FbossError.h"

diff --git a/fboss/agent/hw/bcm/BcmSwitch.cpp b/fboss/agent/hw/bcm/BcmSwitch.cpp
@@ -24,6 +24,8 @@
 #include "fboss/agent/Utils.h"
 #include "fboss/agent/hw/BufferStatsLogger.h"
 #include "fboss/agent/hw/bcm/BcmAPI.h"
+#include "fboss/agent/hw/bcm/BcmAclTable.h"
+#include "fboss/agent/hw/bcm/BcmCosManager.h"
 #include "fboss/agent/hw/bcm/BcmControlPlane.h"
 #include "fboss/agent/hw/bcm/BcmCosManager.h"
 #include "fboss/agent/hw/bcm/BcmError.h"
@@ -37,6 +39,8 @@
 #include "fboss/agent/hw/bcm/BcmRoute.h"
 #include "fboss/agent/hw/bcm/BcmRxPacket.h"
 #include "fboss/agent/hw/bcm/BcmSflowExporter.h"
+#include "fboss/agent/hw/bcm/BcmStatUpdater.h"
+#include "fboss/agent/hw/bcm/BcmSwitchEventCallback.h"
 #include "fboss/agent/hw/bcm/BcmSwitchEventUtils.h"
 #include "fboss/agent/hw/bcm/BcmTableStats.h"
 #include "fboss/agent/hw/bcm/BcmTrunkTable.h"

diff --git a/fboss/agent/hw/bcm/BcmSwitch.h b/fboss/agent/hw/bcm/BcmSwitch.h
@@ -9,15 +9,9 @@
  */
 #pragma once
 
-#include "common/stats/MonotonicCounter.h"
 #include "fboss/agent/HwSwitch.h"
 #include "fboss/agent/types.h"
 #include "fboss/agent/gen-cpp2/switch_config_types.h"
-#include "fboss/agent/hw/bcm/BcmAclTable.h"
-#include "fboss/agent/hw/bcm/BcmCosManager.h"
-#include "fboss/agent/hw/bcm/BcmSwitchEventCallback.h"
-#include "fboss/agent/hw/bcm/BcmStatUpdater.h"
-#include "fboss/agent/hw/bcm/gen-cpp2/packettrace_types.h"
 #include <folly/dynamic.h>
 
 #include <gtest/gtest_prod.h>
@@ -38,21 +32,26 @@ namespace facebook { namespace fboss {
 class AclEntry;
 class AggregatePort;
 class ArpEntry;
+class BcmAclTable;
 class BcmControlPlane;
+class BcmCosManager;
 class BcmEgress;
 class BcmHostTable;
 class BcmIntfTable;
 class BcmPlatform;
 class BcmPortTable;
 class BcmRouteTable;
 class BcmRxPacket;
+class BcmStatUpdater;
+class BcmSwitchEventCallback;
 class BcmTableStats;
 class BcmTrunkTable;
 class BcmUnit;
 class BcmWarmBootCache;
 class BcmWarmBootHelper;
 class BcmSflowExporterTable;
 class LoadBalancer;
+class PacketTraceInfo;
 class SflowCollector;
 class MockRxPacket;
 class Interface;

diff --git a/fboss/agent/hw/bcm/BcmWarmBootCache.cpp b/fboss/agent/hw/bcm/BcmWarmBootCache.cpp
@@ -18,6 +18,7 @@
 
 #include "fboss/agent/Constants.h"
 #include "fboss/agent/SysError.h"
+#include "fboss/agent/hw/bcm/BcmAclTable.h"
 #include "fboss/agent/hw/bcm/BcmEgress.h"
 #include "fboss/agent/hw/bcm/BcmError.h"
 #include "fboss/agent/hw/bcm/BcmPlatform.h"

diff --git a/fboss/agent/hw/bcm/BcmWarmBootCache.h b/fboss/agent/hw/bcm/BcmWarmBootCache.h
@@ -30,9 +30,10 @@ extern "C" {
 #include "fboss/agent/state/RouteTypes.h"
 #include "fboss/agent/types.h"
 
+#include "fboss/agent/hw/bcm/BcmAclRange.h"
+
 namespace facebook { namespace fboss {
 class AclMap;
-class AclRange;
 class BcmSwitch;
 class BcmSwitchIf;
 class InterfaceMap;

diff --git a/fboss/agent/hw/bcm/MockBcmSwitch.h b/fboss/agent/hw/bcm/MockBcmSwitch.h
@@ -3,6 +3,7 @@
 #include "fboss/agent/hw/bcm/BcmSwitch.h"
 #include "fboss/agent/hw/bcm/BcmUnit.h"
 #include "fboss/agent/hw/bcm/BcmTxPacket.h"
+#include "fboss/agent/hw/bcm/gen-cpp2/packettrace_types.h"
 
 #include <gmock/gmock.h>
 

diff --git a/fboss/agent/hw/bcm/oss/BcmSwitch.cpp b/fboss/agent/hw/bcm/oss/BcmSwitch.cpp
@@ -11,6 +11,7 @@
 
 #include "fboss/agent/hw/BufferStatsLogger.h"
 #include "fboss/agent/hw/bcm/BcmRxPacket.h"
+#include "fboss/agent/hw/bcm/gen-cpp2/packettrace_types.h"
 
 #include <folly/Memory.h>
 #include <folly/logging/xlog.h>