Index: NetFlow9Processor.cpp
===================================================================
--- NetFlow9Processor.cpp	(revision 98e63312c12d1c018780f4b5bbf010c4376c503a)
+++ NetFlow9Processor.cpp	(revision 40df8a5b0c17cb47d9bda3f8684a55d7962ac9ad)
@@ -1,8 +1,2 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
 #include "NetFlow9Processor.h"
 
Index: NetFlow9Processor.h
===================================================================
--- NetFlow9Processor.h	(revision 98e63312c12d1c018780f4b5bbf010c4376c503a)
+++ NetFlow9Processor.h	(revision 40df8a5b0c17cb47d9bda3f8684a55d7962ac9ad)
@@ -1,2 +1,8 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
 #include "NetFlowDataTemplateCache.h"
 #include "FlowSet.h"
@@ -5,4 +11,11 @@
 #define NETFLOW9PROCESSOR
 class NetFlow9Processor{
+
+
+	public:
+
+		NetFlow9Processor(struct sockaddr *remaddr, socklen_t *addrlen);
+		int ProcessPacket(unsigned char b[], int l, FlowSet* processedFlowSet);
+
 
 	private:
@@ -19,9 +32,4 @@
 
 
-	public:
-
-		NetFlow9Processor(struct sockaddr *remaddr, socklen_t *addrlen);
-		int ProcessPacket(unsigned char b[], int l, FlowSet* processedFlowSet);
-
 };
 
Index: NetFlowDataTemplateCache.cpp
===================================================================
--- NetFlowDataTemplateCache.cpp	(revision 98e63312c12d1c018780f4b5bbf010c4376c503a)
+++ NetFlowDataTemplateCache.cpp	(revision 40df8a5b0c17cb47d9bda3f8684a55d7962ac9ad)
@@ -1,6 +1,3 @@
 #include "NetFlowDataTemplateCache.h"
-#include <stdlib.h>
-#include <stdexcept>
-#include <stdio.h>
 
 NetFlowDataTemplateCache::NetFlowDataTemplateCache(void) {
Index: NetFlowDataTemplateCache.h
===================================================================
--- NetFlowDataTemplateCache.h	(revision 98e63312c12d1c018780f4b5bbf010c4376c503a)
+++ NetFlowDataTemplateCache.h	(revision 40df8a5b0c17cb47d9bda3f8684a55d7962ac9ad)
@@ -1,4 +1,7 @@
+#include <stdlib.h>
+#include <stdexcept>
+#include <stdio.h>
+#include <map>
 #include "NetFlowDataTemplate.h"
-#include <map>
 
 #ifndef NETFLOWDATATEMPLATECACHE
@@ -6,7 +9,4 @@
 
 class NetFlowDataTemplateCache{
-
-    private:
-		std::map<unsigned short, NetFlowDataTemplate*> Cache;
 
     public:
@@ -17,5 +17,10 @@
 		NetFlowDataTemplate* DeleteDataTemplate(unsigned short id);
 		NetFlowDataTemplate* GetDataTemplate(unsigned short id);
-		
+
+
+	private:
+		std::map<unsigned short, NetFlowDataTemplate*> Cache;
+
+
 };