diff --git a/celt.kdevelop b/celt.kdevelop
index 758357c0a0ebef930d05a8291e2bb5c553208da1..4ff1619adad502be7110e3704e6dbfbfb5a84611 100644
--- a/celt.kdevelop
+++ b/celt.kdevelop
@@ -8,13 +8,28 @@
     <primarylanguage>C</primarylanguage>
     <ignoreparts/>
     <projectname>celt</projectname>
+    <projectdirectory>.</projectdirectory>
+    <absoluteprojectpath>false</absoluteprojectpath>
+    <description></description>
+    <defaultencoding></defaultencoding>
   </general>
   <kdevautoproject>
     <general>
       <useconfiguration>default</useconfiguration>
       <activetarget>libcelt/libcelt.la</activetarget>
     </general>
-    <run/>
+    <run>
+      <mainprogram/>
+      <programargs/>
+      <globaldebugarguments/>
+      <globalcwd/>
+      <useglobalprogram>true</useglobalprogram>
+      <terminal>false</terminal>
+      <autocompile>false</autocompile>
+      <autoinstall>false</autoinstall>
+      <autokdesu>false</autokdesu>
+      <envvars/>
+    </run>
     <configurations>
       <optimized>
         <builddir>optimized</builddir>
@@ -42,7 +57,20 @@
   <kdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
+      <gdbpath></gdbpath>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
+      <breakonloadinglibs>true</breakonloadinglibs>
+      <separatetty>false</separatetty>
+      <floatingtoolbar>false</floatingtoolbar>
+      <raiseGDBOnStart>false</raiseGDBOnStart>
     </general>
+    <display>
+      <staticmembers>false</staticmembers>
+      <demanglenames>true</demanglenames>
+      <outputradix>10</outputradix>
+    </display>
   </kdevdebugger>
   <kdevdoctreeview>
     <ignoretocs>
@@ -104,13 +132,12 @@
       <used>false</used>
       <version>3</version>
       <includestyle>3</includestyle>
-      <root>/usr/share/qt3</root>
+      <root></root>
       <designerintegration>EmbeddedKDevDesigner</designerintegration>
-      <qmake>/usr/bin/qmake-qt3</qmake>
-      <designer>/usr/bin/designer</designer>
+      <qmake></qmake>
+      <designer></designer>
       <designerpluginpaths/>
     </qt>
-    <references/>
     <codecompletion>
       <automaticCodeCompletion>false</automaticCodeCompletion>
       <automaticArgumentsHint>true</automaticArgumentsHint>
@@ -134,15 +161,39 @@
       <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
       <includePaths>.;</includePaths>
     </codecompletion>
+    <creategettersetter>
+      <prefixGet></prefixGet>
+      <prefixSet>set</prefixSet>
+      <prefixVariable>m_,_</prefixVariable>
+      <parameterName>theValue</parameterName>
+      <inlineGet>true</inlineGet>
+      <inlineSet>true</inlineSet>
+    </creategettersetter>
+    <splitheadersource>
+      <enabled>true</enabled>
+      <synchronize>true</synchronize>
+      <orientation>Horizontal</orientation>
+    </splitheadersource>
+    <references/>
   </kdevcppsupport>
+  <cppsupportpart>
+    <filetemplates>
+      <interfacesuffix>.h</interfacesuffix>
+      <implementationsuffix>.cpp</implementationsuffix>
+    </filetemplates>
+  </cppsupportpart>
   <kdevfileview>
-    <groups>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
+    <groups/>
     <tree>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
   </kdevfileview>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem></docsystem>
+      <docurl></docurl>
+      <usermanualurl></usermanualurl>
+    </projectdoc>
+  </kdevdocumentation>
 </kdevelop>
diff --git a/libcelt/celt.c b/libcelt/celt.c
index 2c82f2195549412154c411fc6708225cae418cf2..2a6607f6e0e065f246b0856f183f7c191990d2cc 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -41,7 +41,7 @@
 
 #define MAX_PERIOD 1024
 
-struct CELTState_ {
+struct CELTState {
    const CELTMode *mode;
    int frame_size;
    int block_size;
@@ -104,6 +104,8 @@ void celt_encoder_destroy(CELTState *st)
       celt_warning("NULL passed to celt_encoder_destroy");
       return;
    }
+   ec_byte_writeclear(&st->buf);
+
    mdct_clear(&st->mdct_lookup);
    spx_fft_destroy(st->fft);
 
@@ -112,6 +114,7 @@ void celt_encoder_destroy(CELTState *st)
    celt_free(st->mdct_overlap);
    celt_free(st->out_mem);
    
+   celt_free(st->oldBandE);
    celt_free(st);
 }
 
diff --git a/libcelt/celt.h b/libcelt/celt.h
index d9a75d657e0952f3ef48d860db4f3b0005eec569..53cbb894885c69d640146ecf7114407297f3a076 100644
--- a/libcelt/celt.h
+++ b/libcelt/celt.h
@@ -32,11 +32,9 @@
 #ifndef CELT_H
 #define CELT_H
 
-struct CELTState_;
-typedef struct CELTState_ CELTState;
+typedef struct CELTState CELTState;
 
-struct CELTMode_;
-typedef struct CELTMode_ CELTMode;
+typedef struct CELTMode CELTMode;
 
 extern const CELTMode const *celt_mode1;
 
diff --git a/libcelt/modes.h b/libcelt/modes.h
index 1d5146d8da9fd78307b20df238805b378633489e..ed9ed6ce906e8191606a0b2e372e42e6d5e31507 100644
--- a/libcelt/modes.h
+++ b/libcelt/modes.h
@@ -34,7 +34,7 @@
 
 #include "celt.h"
 
-struct CELTMode_ {
+struct CELTMode {
    int          frameSize;
    int          mdctSize;
    int          nbMdctBlocks;
diff --git a/libcelt/testcelt.c b/libcelt/testcelt.c
index 23403dcf72b92e816e070ea2a093a89ae743c73b..09b5a0e87d0038a7f4b44ea173ff28d092262e73 100644
--- a/libcelt/testcelt.c
+++ b/libcelt/testcelt.c
@@ -57,6 +57,8 @@ int main(int argc, char *argv[])
       fwrite(in, sizeof(short), FRAME_SIZE, fout);
    }
    celt_encoder_destroy(st);
+   fclose(fin);
+   fclose(fout);
    return 0;
 }