diff --git a/src/MsgHandler.cpp b/src/MsgHandler.cpp
index 938671b..2403b5d 100644
--- a/src/MsgHandler.cpp
+++ b/src/MsgHandler.cpp
@@ -1,17 +1,4 @@
 #include <MsgHandler.h>
-#include <IpmiMessage.h>
-#include <IpmiCommandDefines.h>
-#include <BashScriptDefines.h>
-
-#include <ChassisCMD.h>
-#include <ChannelCMD.h>
-#include <LANCMD.h>
-#include <PefCMD.h>
-#include <SessionCMD.h>
-#include <SoLCMD.h>
-
-#include <fstream>
-#include <stdlib.h>
 
 using namespace IpmiCommandDefines;
 extern std::ofstream log_file;
diff --git a/src/MsgHandler.h b/src/MsgHandler.h
index d7332c6..fd42f6e 100644
--- a/src/MsgHandler.h
+++ b/src/MsgHandler.h
@@ -2,6 +2,21 @@
 #define MSGHANDLER_H
 
 #include <map>
+#include <stddef.h>
+
+#include <IpmiMessage.h>
+#include <IpmiCommandDefines.h>
+#include <BashScriptDefines.h>
+
+#include <ChassisCMD.h>
+#include <ChannelCMD.h>
+#include <LANCMD.h>
+#include <PefCMD.h>
+#include <SessionCMD.h>
+#include <SoLCMD.h>
+
+#include <fstream>
+#include <stdlib.h>
 
 class I_Command;
 class IpmiMessage;