dns/hostaddress.cpp
     dns/timetolive.cpp
     host/hoststatusanalyzer.cpp
-    host/icmppinger.cpp
     host/pinginterval.cpp
     host/pingscheduler.cpp
     icmp/icmpdestinationunreachablemessage.cpp
     icmp/icmpechoreplymessage.cpp
     icmp/icmpechorequestmessage.cpp
     icmp/icmpgenericmessage.cpp
+    icmp/icmpheader.cpp
     icmp/icmpmessage.cpp
     icmp/icmpmessagepayload.cpp
-    icmp/icmpheader.cpp
     icmp/icmppacket.cpp
+    icmp/icmppinger.cpp
     icmp/ipv4header.cpp
     link/linkstatusanalyzer.cpp
     link/statusnotifiercommand.cpp
 
 #include "dns/dnsresolver.h"
 #include "link/linkstatusanalyzer.h"
 #include "host/hoststatusanalyzer.h"
-#include "host/icmppinger.h"
 #include "host/pinginterval.h"
+#include "icmp/icmppinger.h"
 
 //-----------------------------------------------------------------------------
 // PingScheduler
 
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
-#include "host/icmppinger.h"
+#include "icmp/icmppinger.h"
 
 #include <istream>
 #include <ostream>