Glucoseamine , chrondroiten and MSM , take this daily and you will be all good to go. You can find them VERY EASILY combined in the same supplement for not much money at all. I believe anyone that lifts regularly and trains hard as hell MUST be taking these just as they would a multi vitamin, to me it's in the same boat!
And as stated earlier Fish Oil, Flax Seed are solid to include. Actually Nature Made supplements makes a combo one called Triple Omega , and it included Fish, Flax, Safflower, and Olive Oil's all together. It is what i use and i have had great results. by second week i no longer had any joint pain whatsoever running both of these things and i felt way better, not to mention by around the 4th week i started to lean out a little more than usual due to getting the good fats in my body regularly.