diff --git a/c_gen/templates/class.c b/c_gen/templates/class.c
index 849ea80..170cf54 100644
--- a/c_gen/templates/class.c
+++ b/c_gen/templates/class.c
@@ -28,8 +28,6 @@
 :: include('_copyright.c')
 :: include('_pragmas.c')
 
-#include <loci/loci.h>
-#include <loci/of_object.h>
 #include "loci_log.h"
 #include "loci_push_wire_types.h"
 #include "loci_int.h"
diff --git a/c_gen/templates/loci_int.h b/c_gen/templates/loci_int.h
index 4cd48b6..b4df78c 100644
--- a/c_gen/templates/loci_int.h
+++ b/c_gen/templates/loci_int.h
@@ -44,6 +44,8 @@
 #ifndef __LOCI_INT_H__
 #define __LOCI_INT_H__
 
+#include <loci/loci.h>
+
 /****************************************************************
  * Special case macros for calculating variable lengths and offsets
  ****************************************************************/
@@ -269,5 +271,4 @@
      ((object_id) == OF_FLOW_DELETE_STRICT) ||         \
      ((object_id) == OF_FLOW_ADD))
 
-#include <loci/loci.h> 
 #endif /* __LOCI_INT_H__ */
diff --git a/c_gen/templates/loci_log.h b/c_gen/templates/loci_log.h
index 25b9a67..14a68cf 100644
--- a/c_gen/templates/loci_log.h
+++ b/c_gen/templates/loci_log.h
@@ -30,10 +30,6 @@
 #if !defined(_LOCI_LOG_H_)
 #define _LOCI_LOG_H_
 
-#include <loci/loci_base.h>
-#include <loci/of_match.h>
-#include <stdio.h>
-
 /* g++ requires this to pick up PRI, etc.
  * See  http://gcc.gnu.org/ml/gcc-help/2006-10/msg00223.html
  */