diff --git a/include/emcl2/Pose.h b/include/emcl2/Pose.h
index 18d263c..bba7669 100644
--- a/include/emcl2/Pose.h
+++ b/include/emcl2/Pose.h
@@ -6,6 +6,7 @@
 
 #include <sstream>
 #include <string>
+#include <cstdint>
 
 namespace emcl2
 {
diff --git a/include/emcl2/Scan.h b/include/emcl2/Scan.h
index 6846231..9e9c214 100644
--- a/include/emcl2/Scan.h
+++ b/include/emcl2/Scan.h
@@ -6,6 +6,7 @@
 
 #include <iostream>
 #include <vector>
+#include <cstdint>
 
 namespace emcl2
 {
diff --git a/src/emcl2_node.cpp b/src/emcl2_node.cpp
index 8ad3b62..a2453a4 100644
--- a/src/emcl2_node.cpp
+++ b/src/emcl2_node.cpp
@@ -126,8 +126,8 @@ void EMcl2Node::initTF(void)
 
 void EMcl2Node::initPF(void)
 {
-	std::shared_ptr<LikelihoodFieldMap> map = std::move(initMap());
-	std::shared_ptr<OdomModel> om = std::move(initOdometry());
+	std::shared_ptr<LikelihoodFieldMap> map = initMap();
+	std::shared_ptr<OdomModel> om = initOdometry();
 
 	Scan scan;
 	this->get_parameter("laser_min_range", scan.range_min_);