diff --git a/src/grib_templates.h b/src/deprecated/grib_templates.h
similarity index 100%
rename from src/grib_templates.h
rename to src/deprecated/grib_templates.h
diff --git a/src/grib_api_internal.h b/src/grib_api_internal.h
index 940b3e238..8b1517f5a 100644
--- a/src/grib_api_internal.h
+++ b/src/grib_api_internal.h
@@ -1269,30 +1269,6 @@ struct grib_fieldset
 };
 #endif
 
-#if 0
-/* grib db */
-struct grib_db
-{
-    grib_context* context;
-    size_t size;
-    size_t fields_array_size;
-    grib_column* columns;
-    size_t columns_size;
-    grib_field** fields;
-};
-
-struct grib_fieldset
-{
-    grib_context* context;
-    grib_db* db;
-    grib_int_array* filter;
-    grib_int_array* order;
-    size_t size;
-    grib_query* query;
-    long current;
-};
-#endif
-
 /* concept index structures */
 
 typedef struct grib_concept_index_key grib_concept_index_key;
diff --git a/src/grib_bits_any_endian_simple.h b/src/grib_bits_any_endian_simple.h
index 93ed509a5..6a628e515 100644
--- a/src/grib_bits_any_endian_simple.h
+++ b/src/grib_bits_any_endian_simple.h
@@ -27,7 +27,7 @@ int grib_decode_array(const unsigned char* p, long* bitp, long bitsPerValue,
     unsigned long lvalue = 0;
     T x;
 
-#if 0
+#ifdef SLOW_OLD_CODE
     /* slow reference code */
     int j=0;
     for(i=0; i < n_vals; i++) {
diff --git a/src/grib_templates.cc b/src/grib_templates.cc
index 24648d61f..8a76900c9 100644
--- a/src/grib_templates.cc
+++ b/src/grib_templates.cc
@@ -26,8 +26,6 @@ typedef struct grib_templates {
     size_t               size;
 } grib_templates;
 
-#include "grib_templates.h"
-
 #define NUMBER(x) (sizeof(x) / sizeof(x[0]))
 
 grib_handle* grib_internal_sample(grib_context* c,const char* name)