diff --git a/simulation/src/applications/CMakeLists.txt b/simulation/src/applications/CMakeLists.txt
index 4983083..e89b398 100644
--- a/simulation/src/applications/CMakeLists.txt
+++ b/simulation/src/applications/CMakeLists.txt
@@ -12,7 +12,7 @@ list(FILTER ASTRA_SIM_SOURCE_FILES EXCLUDE  REGEX ".*SimAiFlowModelRdma\\.cc")
 list(FILTER ASTRA_SIM_SOURCE_FILES EXCLUDE  REGEX ".*PhyMultiThread\\.cc")
 
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+#include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 build_lib(
   LIBNAME applications
diff --git a/simulation/src/network/utils/bit-deserializer.h b/simulation/src/network/utils/bit-deserializer.h
index bed6399..ca72765 100644
--- a/simulation/src/network/utils/bit-deserializer.h
+++ b/simulation/src/network/utils/bit-deserializer.h
@@ -23,6 +23,7 @@
 
 #include <vector>
 #include <deque>
+#include <cstdint>
 
 namespace ns3 {
 
diff --git a/simulation/src/network/utils/bit-serializer.h b/simulation/src/network/utils/bit-serializer.h
index acaf1fe..e75df51 100644
--- a/simulation/src/network/utils/bit-serializer.h
+++ b/simulation/src/network/utils/bit-serializer.h
@@ -22,6 +22,7 @@
 #define BITSERIALIZER_H_
 
 #include <vector>
+#include <cstdint>
 
 namespace ns3 {
 
diff --git a/simulation/src/point-to-point/model/rdma-hw.cc b/simulation/src/point-to-point/model/rdma-hw.cc
index e624698..98beaaf 100644
--- a/simulation/src/point-to-point/model/rdma-hw.cc
+++ b/simulation/src/point-to-point/model/rdma-hw.cc
@@ -403,6 +403,7 @@ int RdmaHw::SendPacketComplete(Ptr<Packet> p, CustomHeader &ch)
 	uint32_t nic_idx = GetNicIdxOfQp(qp);
 	Ptr<QbbNetDevice> dev = m_nic[nic_idx].dev;
 	SendComplete(qp);
+	return 0;
 }
 
 void RdmaHw::SendComplete(Ptr<RdmaQueuePair> qp)
diff --git a/simulation/src/wifi/model/block-ack-type.h b/simulation/src/wifi/model/block-ack-type.h
index 07b21fb..6ec7585 100644
--- a/simulation/src/wifi/model/block-ack-type.h
+++ b/simulation/src/wifi/model/block-ack-type.h
@@ -23,6 +23,7 @@
 
 #include <ostream>
 #include <vector>
+#include <cstdint>
 
 namespace ns3 {