diff --git a/src/pulsecore/resampleLoader.h b/src/pulsecore/resampleLoader.h
index 60e8d9c0b28a1f96fc376b1ad9e8595955b19467..d95daea52cdade0464df90b365f4064001fb60e6 100644
--- a/src/pulsecore/resampleLoader.h
+++ b/src/pulsecore/resampleLoader.h
@@ -12,10 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#ifndef RESAMPLERLOADER_H
+#define RESAMPLERLOADER_H
 #include <dlfcn.h>
 #include <unistd.h>
 #include "log/audio_log.h"
 #include "config.h"
 #include "resampler.h"
 #define PRORESAMPLERINIT_SYM_AS_STR "ProResamplerInit"
-bool LoadProResampler(int (**func_ptr)(pa_resampler *r));
\ No newline at end of file
+bool LoadProResampler(int (**func_ptr)(pa_resampler *r));
+
+#endif // RESAMPLERLOADER_H
\ No newline at end of file
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index c562f22228ecf0a5d34f318cac5adaaeb4c0b126..50158c7e9fa4d54040442d1d763cf3b5638a035c 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -2219,8 +2219,6 @@ int pa_sink_input_finish_move(pa_sink_input *i, pa_sink *dest, bool save) {
 
     pa_sink_input_update_resampler(i, false);
 
-    // restore_render_memblockq(i); // restore is needless for moving between sinks
-
     pa_sink_update_status(dest);
 
     update_volume_due_to_moving(i, dest);
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index b355e3dccd4b306cabd1c7b577baf95a4bcb55e9..d2f8bd0deb1e440b3050413e098c1c8469bb2bb5 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -2766,7 +2766,6 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
                 /* Save some current values for restore_render_memblockq() */
                 i->thread_info.origin_sink_latency = pa_sink_get_latency_within_thread(s, false);
                 // may cause pop during switch between OFFLOAD and PRIMARY
-                // i->thread_info.move_start_time = pa_rtclock_now();
                 i->thread_info.resampler_delay_frames = 0;
                 if (i->thread_info.resampler)
                     /* Round down */